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

2006-03-22 Robert Love <rml@novell.com>

Browse source 
Bug fix by Timo Hoenig <thoenig@suse.de>:
	* gnome/applet/applet-dbus.c: Let the applet reconnect to DBUS on
	  disconnect.  Otherwise, we have the daemon surviving DBUS restarts
	  and the applet going AWOL.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1630 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-03-22 21:17:07 +00:00 • committed by Robert Love
parent a82dd957f6
commit 2edcffb40e
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-03-22 Robert Love <rml@novell.com>
Bug fix by Timo Hoenig <thoenig@suse.de>:
* gnome/applet/applet-dbus.c: Let the applet reconnect to DBUS on
disconnect. Otherwise, we have the daemon surviving DBUS restarts
and the applet going AWOL.
2006-03-22 Robert Love <rml@novell.com>
* src/dhcp-manager/nm-dhcp-manager.c: Create NM_DHCP_TIMEOUT

21
gnome/applet/applet-dbus.c
View file

@ -186,7 +186,13 @@ static DBusHandlerResult nma_dbus_filter (DBusConnection *connection, DBusMessag
/* nm_info ("signal(): got signal op='%s' member='%s' interface='%s'", object_path, member, interface); */
if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected"))
{
dbus_connection_unref (applet->connection);
applet->connection = NULL;
applet->nm_running = FALSE;
}
else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
{
char *service;
char *old_owner;
@ -516,11 +522,14 @@ static gboolean nma_dbus_connection_watcher (gpointer user_data)
if ((applet->connection = nma_dbus_init (applet)))
{
applet->nm_running = nma_dbus_nm_is_running (applet->connection);
nma_set_state (applet, NM_STATE_DISCONNECTED);
nma_dbus_update_nm_state (applet);
nma_dbus_update_devices (applet);
nma_dbus_update_dialup (applet);
nma_dbus_vpn_update_vpn_connections (applet);
if (applet->nm_running)
{
nma_set_state (applet, NM_STATE_DISCONNECTED);
nma_dbus_update_nm_state (applet);
nma_dbus_update_devices (applet);
nma_dbus_update_dialup (applet);
nma_dbus_vpn_update_vpn_connections (applet);
}
}
}