system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-05-22 Tambet Ingo <tambet@gmail.com>

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


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3681 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo 2008-05-22 14:27:40 +00:00
parent 79dd84f727
commit 55f9c72b42
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
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.
2008-05-22 Tambet Ingo <tambet@gmail.com>
* src/nm-gsm-device.c (device_state_changed): Make sure we don't leave the

17
src/nm-manager.c
View file

@ -1925,18 +1925,11 @@ impl_manager_sleep (NMManager *manager, gboolean sleep, GError **error)
} 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);