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

2007-10-08 Tambet Ingo <tambet@gmail.com>

Browse Source 
* src/NetworkManager.c (main): When dbus manager doesn't want to
        * start, complain
        about dbus manager, not named manager.
        Make sure hal_manager and dbus_mgr are created before trying to
unreference.

        * src/nm-dbus-manager.c: There was an issue with priv->proxy: We
        * have a signal
        handler for it's 'destroy' signal - we use it to catch
disconnects from dbus.
        However, the same signal is emitted when we destroy it and
there's 
        nm_dbus_manager_cleanup -> destroy_cb -> nm_dbus_manager_cleanup
cycle.

        (nm_dbus_manager_cleanup): Let go of the DBusGProxy before
        releasing the DBusGConnection, since proxy needs a conneciton.
        (destroy_cb): Set the private proxy to NULL before cleaning up
the manager.



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2959 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
2007-10-09 07:51:03 +00:00
parent 71589014c8
commit 591dc59e1f
5 changed files with 31 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/NetworkManager.c
View File

@@ -344,7 +344,7 @@ main (int argc, char *argv[])
/* Start our DBus service */
if (!nm_dbus_manager_start_service (dbus_mgr)) {
nm_warning ("Failed to start the named manager.");
nm_warning ("Failed to start the dbus manager.");
goto done;
}
@@ -367,7 +367,9 @@ done:
if (vpn_manager)
g_object_unref (vpn_manager);
nm_hal_manager_destroy (hal_manager);
if (hal_manager)
nm_hal_manager_destroy (hal_manager);
if (policy)
nm_policy_destroy (policy);
@@ -377,7 +379,9 @@ done:
if (sup_mgr)
g_object_unref (sup_mgr);
g_object_unref (dbus_mgr);
if (dbus_mgr)
g_object_unref (dbus_mgr);
nm_logging_shutdown ();
if (pidfile)