fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-23 03:50:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2005-12-15 Robert Love <rml@novell.com>

Browse source 
Patch by Timo Hoenig  <thoenig@suse.de>:
	* src/NetworkManagerDbus.c
		- (nm_dbus_signal_filter) return DBUS_HANDLER_RESULT_HANDLED
			if HAL jumps off the system bus.  Otherwise libdbus
			(dbus_connection_dispatch) will try to run the filter
			function of our libhal context which is already freed.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1193 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2005-12-15 18:21:10 +00:00 • committed by Robert Love
parent c8ff0a7364
commit 7ea7ac394a
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-12-15 Robert Love <rml@novell.com>
Patch by Timo Hoenig <thoenig@suse.de>:
* src/NetworkManagerDbus.c
- (nm_dbus_signal_filter) return DBUS_HANDLER_RESULT_HANDLED
if HAL jumps off the system bus. Otherwise libdbus
(dbus_connection_dispatch) will try to run the filter
function of our libhal context which is already freed.
2005-12-15 Alexander Shopov <ash@contact.bg>
* configure.in: Added "bg" (Bulgarian) to ALL_LINGUAS

6
src/NetworkManagerDbus.c
View file

@ -1074,9 +1074,15 @@ static DBusHandlerResult nm_dbus_signal_filter (DBusConnection *connection, DBus
else if (strcmp (service, "org.freedesktop.Hal") == 0)
{
if (!old_owner_good && new_owner_good) /* Hal just appeared */
{
nm_hal_init (data);
handled = TRUE;
}
else if (old_owner_good && !new_owner_good) /* Hal went away */
{
nm_hal_deinit (data);
handled = TRUE;
}
}
else if (nm_dhcp_manager_process_name_owner_changed (data->dhcp_manager, service, old_owner, new_owner) == TRUE)
handled = TRUE;