From 59b87ff21ce5aff0beec7411fe4ae46fa83e436b Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Fri, 8 Oct 2004 17:47:45 +0000 Subject: [PATCH] 2004-10-08 John (J5) Palmieri * panel-applet/NMWirelessApplet.c - (nmwa_update_state): Hide notification icon if we are only showing one wired card and no wireless interfaces (Red Hat Bug #134895) * panel-applet/NMWirelessAppletDbus.c - (nmwa_dbus_filter): changed exit to gtk_main_quit () * panel-applet/NWManagerInfo.c - (main): Terminated the notification_icon_cmd array with a NULL git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@202 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 15 +++++++++++++++ configure.in | 6 +++--- info-daemon/NetworkManagerInfo.c | 2 +- panel-applet/NMWirelessAppletDbus.c | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c82e54a85c..7ae78056aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2004-10-08 John (J5) Palmieri + + * panel-applet/NMWirelessApplet.c + - (nmwa_update_state): Hide notification icon if we are only + showing one wired card and no wireless interfaces + (Red Hat Bug #134895) + + * panel-applet/NMWirelessAppletDbus.c + - (nmwa_dbus_filter): changed exit to gtk_main_quit () + + * panel-applet/NWManagerInfo.c + - (main): Terminated the notification_icon_cmd array with a NULL + 2004-10-08 Hendrik Brandt * configure.in (ALL_LINGUAS): Added de (German). @@ -8,6 +21,7 @@ - Be a bit more robust about link checking, ie make sure that the WEP key we were given actually has some data in it +>>>>>>> 1.127 2004-10-08 Dan Williams * info-daemon/NetworkManagerInfo.c (main): @@ -71,6 +85,7 @@ * panel-applet/main.c - Cast the applet appropriately for gtk_widget_show_all () +>>>>>>> 1.125 Mon Oct 4 12:55:41 2004 Jonathan Blandford * panel-applet/eggtrayicon.[ch]: diff --git a/configure.in b/configure.in index 056a24affa..5995f3dc6e 100644 --- a/configure.in +++ b/configure.in @@ -118,9 +118,9 @@ else fi AM_CONDITIONAL(WITH_GCRYPT, test x"$ac_gcrypt" != xno) -PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0) -AC_SUBST(PANEL_APPLET_CFLAGS) -AC_SUBST(PANEL_APPLET_LIBS) +#PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0) +#AC_SUBST(PANEL_APPLET_CFLAGS) +#AC_SUBST(PANEL_APPLET_LIBS) PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) AC_SUBST(LIBGNOMEUI_CFLAFS) diff --git a/info-daemon/NetworkManagerInfo.c b/info-daemon/NetworkManagerInfo.c index f2d307ee40..ba417a711e 100644 --- a/info-daemon/NetworkManagerInfo.c +++ b/info-daemon/NetworkManagerInfo.c @@ -107,7 +107,7 @@ int main( int argc, char *argv[] ) { NULL, '\0', 0, NULL, 0, NULL, NULL } }; - gchar *notification_icon_cmd[] = {LIBEXECDIR"/NetworkManagerNotification"}; + gchar *notification_icon_cmd[] = {LIBEXECDIR"/NetworkManagerNotification", NULL}; options[0].arg = &no_daemon; diff --git a/panel-applet/NMWirelessAppletDbus.c b/panel-applet/NMWirelessAppletDbus.c index 24dc07b42e..0b763725a3 100644 --- a/panel-applet/NMWirelessAppletDbus.c +++ b/panel-applet/NMWirelessAppletDbus.c @@ -1154,7 +1154,7 @@ static DBusHandlerResult nmwa_dbus_filter (DBusConnection *connection, DBusMessa 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 */ + gtk_main_quit (); /* Just die if NetworkManagerInfo dies */ } if (dbus_error_is_set (&error)) dbus_error_free (&error);