From 3195956a0c4b722a27f360f0308a32d3736c4829 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 8 Oct 2004 05:31:19 +0000 Subject: [PATCH] 2004-10-08 Dan Williams * 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 --- ChangeLog | 5 +++++ panel-applet/NMWirelessAppletDbus.c | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35d831b48c..ce1fed14fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-08 Dan Williams + + * panel-applet/NMWirelessAppletDbus.c + - Die if NetworkManagerInfo dies, since it manages our lifetime + 2004-10-08 Dan Williams * info-daemon/NetworkManagerInfo.[ch] diff --git a/panel-applet/NMWirelessAppletDbus.c b/panel-applet/NMWirelessAppletDbus.c index a51cba544d..24dc07b42e 100644 --- a/panel-applet/NMWirelessAppletDbus.c +++ b/panel-applet/NMWirelessAppletDbus.c @@ -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); }