NetworkManager r4194 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Mon Oct 20 11:49:00 2008
New Revision: 4194
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4194&view=rev

Log:
2008-10-20  Dan Williams  <dcbw redhat com>

	* 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.



Modified:
   trunk/ChangeLog
   trunk/src/nm-manager.c

Modified: trunk/src/nm-manager.c
==============================================================================
--- trunk/src/nm-manager.c	(original)
+++ trunk/src/nm-manager.c	Mon Oct 20 11:49:00 2008
@@ -1363,7 +1363,7 @@
 	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 @@
 		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);