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

2006-10-13 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/NetworkManager.c
		- (nm_name_owner_changed_handler): handle NMI coming and going,
		this somehow droppout in the refactor


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2064 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2006-10-14 12:50:20 +00:00
parent c1c40e425d
commit 5270567ae6
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2006-10-13 Dan Williams <dcbw@redhat.com>
* src/NetworkManager.c
- (nm_name_owner_changed_handler): handle NMI coming and going,
this somehow droppout in the refactor
2006-10-13 Dan Williams <dcbw@redhat.com> 2006-10-13 Dan Williams <dcbw@redhat.com>
* Huge DBus refactor: * Huge DBus refactor:

29
src/NetworkManager.c
View File

@@ -647,18 +647,25 @@ nm_name_owner_changed_handler (NMDBusManager *mgr,
gboolean new_owner_good = (new && (strlen (new) > 0)); gboolean new_owner_good = (new && (strlen (new) > 0));
/* Only care about signals from HAL */ /* Only care about signals from HAL */
if (strcmp (name, "org.freedesktop.Hal") != 0) if (strcmp (name, "org.freedesktop.Hal") == 0) {
return; if (!old_owner_good && new_owner_good) {
/* HAL just appeared */
if (!old_owner_good && new_owner_good) { if (!nm_hal_init (data, connection)) {
/* HAL just appeared */ nm_error (NO_HAL_MSG);
if (!nm_hal_init (data, connection)) { exit (EXIT_FAILURE);
nm_error (NO_HAL_MSG); }
exit (EXIT_FAILURE); } else if (old_owner_good && !new_owner_good) {
/* HAL went away. Bad HAL. */
nm_hal_deinit (data);
}
} else if (strcmp (name, NMI_DBUS_SERVICE) == 0) {
if (!old_owner_good && new_owner_good) {
/* NMI appeared, update stuff */
nm_policy_schedule_allowed_ap_list_update (data);
nm_dbus_vpn_schedule_vpn_connections_update (data);
} else if (old_owner_good && !new_owner_good) {
/* nothing */
} }
} else if (old_owner_good && !new_owner_good) {
/* HAL went away. Bad HAL. */
nm_hal_deinit (data);
} }
} }