2004-10-08 Dan Williams <dcbw@redhat.com>

* panel-applet/NMWirelessAppletDbus.c
		- Die if NetworkManagerInfo dies, since it manages our lifetime


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@196 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2004-10-08 05:31:19 +00:00
parent f39b3344c1
commit 3195956a0c
2 changed files with 12 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2004-10-08 Dan Williams <dcbw@redhat.com>
* panel-applet/NMWirelessAppletDbus.c
- Die if NetworkManagerInfo dies, since it manages our lifetime
2004-10-08 Dan Williams <dcbw@redhat.com>
* info-daemon/NetworkManagerInfo.[ch]

View file

@ -1149,9 +1149,13 @@ static DBusHandlerResult nmwa_dbus_filter (DBusConnection *connection, DBusMessa
DBusError error;
dbus_error_init (&error);
if ( dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &service, DBUS_TYPE_INVALID)
&& (strcmp (service, NM_DBUS_SERVICE) == 0))
applet->applet_state = APPLET_STATE_NO_NM;
if (dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &service, DBUS_TYPE_INVALID))
{
if (strcmp (service, NM_DBUS_SERVICE) == 0)
applet->applet_state = APPLET_STATE_NO_NM;
else if (strcmp (service, NMI_DBUS_SERVICE) == 0)
exit (1); /* Just die if NetworkManagerInfo dies */
}
if (dbus_error_is_set (&error))
dbus_error_free (&error);
}