From ad61bd6964bd838d80953fff02ef8c023619e48a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 7 Sep 2005 19:36:06 +0000 Subject: [PATCH] 2005-09-07 Dan Williams Patch from Bill Moss * src/applet-dbus.c - (nmwa_dbus_filter): strip whitespace from beginning and end of VPN login banner git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@949 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ gnome/applet/applet-dbus.c | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7904ded9b2..9b2c853092 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-09-07 Dan Williams + + Patch from Bill Moss + * src/applet-dbus.c + - (nmwa_dbus_filter): strip whitespace from beginning + and end of VPN login banner + 2005-09-07 Dan Williams * The great VPN Manager rewrite of 2005 diff --git a/gnome/applet/applet-dbus.c b/gnome/applet/applet-dbus.c index c9aa9b3327..80b65f6f1a 100644 --- a/gnome/applet/applet-dbus.c +++ b/gnome/applet/applet-dbus.c @@ -293,8 +293,13 @@ static DBusHandlerResult nmwa_dbus_filter (DBusConnection *connection, DBusMessa char *vpn_name; char *banner; - if (dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &vpn_name, DBUS_TYPE_STRING, &banner, DBUS_TYPE_INVALID)) { + if (dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &vpn_name, DBUS_TYPE_STRING, &banner, DBUS_TYPE_INVALID)) + { + char *stripped = g_strstrip (g_strdup (banner)); + nmwa_schedule_vpn_login_banner_dialog (applet, vpn_name, banner); + g_free (stripped); + /* set the 'last_attempt_success' key in gconf so we DON'T prompt for password next time */ set_vpn_last_attempt_status (applet, vpn_name, TRUE); }