colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-10-20 Dan Williams <dcbw@redhat.com>

Browse Source 
* 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
This commit is contained in:
Dan Williams
2008-10-20 11:49:00 +00:00
parent 84a73bfeb2
commit 01a283d039
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
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.
2008-10-18 Dan Williams <dcbw@redhat.com> 2008-10-18 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-settings.c * libnm-glib/nm-settings.c

4
src/nm-manager.c
View File

@@ -1363,7 +1363,7 @@ initial_get_connections (gpointer user_data)
NMManager *manager = NM_MANAGER (user_data); NMManager *manager = NM_MANAGER (user_data);
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager); 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)) { NM_DBUS_SERVICE_SYSTEM_SETTINGS)) {
query_system_settings_property (manager, "UnmanagedDevices", system_settings_get_unmanaged_devices_cb); query_system_settings_property (manager, "UnmanagedDevices", system_settings_get_unmanaged_devices_cb);
query_system_settings_property (manager, "Hostname", system_settings_get_hostname_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); 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)) NM_DBUS_SERVICE_USER_SETTINGS))
query_connections (manager, NM_CONNECTION_SCOPE_USER); query_connections (manager, NM_CONNECTION_SCOPE_USER);