From 01a283d0390cc777defd3d191d1b871ca0f23be0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 20 Oct 2008 11:49:00 +0000 Subject: [PATCH] 2008-10-20 Dan Williams * src/nm-manager.c - (initial_get_connections): use private dbus manager, don't keep ref-ing the singleton. Fixes mismatched refcounts of the dbus manager object. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4194 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/nm-manager.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 790f1d942..06b38ecdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-20 Dan Williams + + * src/nm-manager.c + - (initial_get_connections): use private dbus manager, don't keep + ref-ing the singleton. Fixes mismatched refcounts of the dbus + manager object. + 2008-10-18 Dan Williams * libnm-glib/nm-settings.c diff --git a/src/nm-manager.c b/src/nm-manager.c index 403327aa8..8596337b3 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1363,7 +1363,7 @@ initial_get_connections (gpointer user_data) NMManager *manager = NM_MANAGER (user_data); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager); - if (nm_dbus_manager_name_has_owner (nm_dbus_manager_get (), + if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_SYSTEM_SETTINGS)) { query_system_settings_property (manager, "UnmanagedDevices", system_settings_get_unmanaged_devices_cb); query_system_settings_property (manager, "Hostname", system_settings_get_hostname_cb); @@ -1373,7 +1373,7 @@ initial_get_connections (gpointer user_data) priv->poke_id = g_idle_add (poke_system_settings_daemon_cb, (gpointer) manager); } - if (nm_dbus_manager_name_has_owner (nm_dbus_manager_get (), + if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS)) query_connections (manager, NM_CONNECTION_SCOPE_USER);