fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 09:58:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: simplify NMSysconfigConnection disposal

Browse source 
Use GHashTableIters again.
This commit is contained in:
Dan Williams 2010-08-27 12:49:01 -05:00
parent 25a59910b9
commit 4f2266de64
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/system-settings/nm-sysconfig-connection.c
View file

@ -1016,15 +1016,6 @@ nm_sysconfig_connection_init (NMSysconfigConnection *self)
}
static void
access_list_dispose (gpointer key, gpointer value, gpointer user_data)
{
NMSysconfigConnection *connection = (NMSysconfigConnection *) user_data;
NMSessionInfo *session = (NMSessionInfo *) value;
g_signal_handlers_disconnect_by_func (session, session_removed_cb, connection);
}
static void
dispose (GObject *object)
{
@ -1032,6 +1023,8 @@ dispose (GObject *object)
NMSysconfigConnectionPrivate *priv = NM_SYSCONFIG_CONNECTION_GET_PRIVATE (self);
NMSessionManager *session_manager = nm_session_manager_get ();
GSList *iter;
GHashTableIter hiter;
gpointer value;
if (priv->secrets)
g_object_unref (priv->secrets);
@ -1048,8 +1041,11 @@ dispose (GObject *object)
set_visibility (self, FALSE);
g_signal_handlers_disconnect_by_func (session_manager, session_added_cb, self);
g_hash_table_foreach (priv->access_list, access_list_dispose, self);
g_hash_table_unref (priv->access_list);
g_hash_table_iter_init (&hiter, priv->access_list);
while (g_hash_table_iter_next (&hiter, NULL, &value))
g_signal_handlers_disconnect_by_func (NM_SESSION_INFO (value), session_removed_cb, self);
g_hash_table_destroy (priv->access_list);
priv->access_list = NULL;
G_OBJECT_CLASS (nm_sysconfig_connection_parent_class)->dispose (object);