NetworkManager r3681 - in trunk: . src

[tambeti svn gnome org]

Author: tambeti
Date: Thu May 22 14:27:40 2008
New Revision: 3681
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3681&view=rev

Log:
2008-05-22  Tambet Ingo  <tambet gmail com>

	* src/nm-manager.c (impl_manager_sleep): No need to schedule the sync
	anymore, do it right away.


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	Thu May 22 14:27:40 2008
@@ -1925,18 +1925,11 @@
 	} else {
 		nm_info  ("Waking up...");
 
-		/* Punt adding back devices to an idle handler to give the manager
-		 * time to push signals out over D-Bus when it wakes up.  Since the
-		 * signal emission might ref the old pre-sleep device, when the new
-		 * device gets found there will be a D-Bus object path conflict between
-		 * the old device and the new device, and dbus-glib "helpfully" asserts
-		 * here and we die.
-		 */
-		if (!priv->sync_devices_id)
-			priv->sync_devices_id = g_idle_add_full (G_PRIORITY_LOW,
-											 deferred_sync_devices,
-											 manager,
-											 NULL);
+		sync_devices (manager);
+		if (priv->sync_devices_id) {
+			g_source_remove (priv->sync_devices_id);
+			priv->sync_devices_id = 0;
+		}
 	}
 
 	nm_manager_update_state (manager);