From 6685c4cf319caa50c503547a5cad48c9f7264ecb Mon Sep 17 00:00:00 2001 From: Robert Love Date: Mon, 10 Apr 2006 16:21:37 +0000 Subject: [PATCH] 2006-04-10 Robert Love * gnome/vpn-properties/nm-vpn-properties.c: Validate VPN settings on 'Back' too or else the 'Forward' option is initially disabled despite valid input. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1676 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ gnome/vpn-properties/nm-vpn-properties.c | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8e8cbb9cc..815b8dfb44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-10 Robert Love + + * gnome/vpn-properties/nm-vpn-properties.c: Validate VPN settings on + 'Back' too or else the 'Forward' option is initially disabled despite + valid input. + 2006-04-06 Robert Love Fix bad but simple bug where an active modem connection did not update diff --git a/gnome/vpn-properties/nm-vpn-properties.c b/gnome/vpn-properties/nm-vpn-properties.c index 3e5b01d5e8..042eb0b8b4 100644 --- a/gnome/vpn-properties/nm-vpn-properties.c +++ b/gnome/vpn-properties/nm-vpn-properties.c @@ -269,7 +269,19 @@ static void vpn_druid_vpn_details_page_prepare (GnomeDruidPage *druidpage, GtkWidget *widget, gpointer user_data) { - gnome_druid_set_buttons_sensitive (druid, TRUE, FALSE, TRUE, FALSE); + gboolean is_valid; + NetworkManagerVpnUI *vpn_ui; + + is_valid = FALSE; + + /*printf ("vpn_druid_von_details_page_prepare!\n");*/ + + /* validate input, in case we are coming in via 'Back' */ + vpn_ui = (NetworkManagerVpnUI *) g_slist_nth_data (vpn_types, gtk_combo_box_get_active (vpn_type_combo_box)); + if (vpn_ui != NULL) + is_valid = vpn_ui->is_valid (vpn_ui); + + gnome_druid_set_buttons_sensitive (druid, TRUE, is_valid, TRUE, FALSE); } static gboolean vpn_druid_vpn_details_page_next (GnomeDruidPage *druidpage, @@ -818,7 +830,7 @@ static void get_all_vpn_connections (void) gconf_value_get_list_type (value) != GCONF_VALUE_STRING || (conn_vpn_data = gconf_value_get_list (value)) == NULL) goto error; - + //conn_user_can_edit = (strcmp (conn_name, "RH VPN Boston") != 0); gtk_list_store_append (vpn_conn_list, &iter);