[network-manager-openconnect] properties: Don't check_validity() so early
- From: David Woodhouse <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openconnect] properties: Don't check_validity() so early
- Date: Mon, 15 Oct 2012 05:31:48 +0000 (UTC)
commit 62d193d2d5c1f3699a2610334465422f2396275a
Author: Kevin Cernekee <cernekee gmail com>
Date: Sat Oct 13 19:06:26 2012 -0700
properties: Don't check_validity() so early
update_connection() now has logic that grays/ungrays the token string
field based on the token source dropdown. But if the gateway or proxy
is invalid, this new code never runs.
properties/nm-openconnect.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/properties/nm-openconnect.c b/properties/nm-openconnect.c
index b7ca0e1..71cbe3c 100644
--- a/properties/nm-openconnect.c
+++ b/properties/nm-openconnect.c
@@ -518,9 +518,6 @@ update_connection (NMVpnPluginUiWidgetInterface *iface,
GtkTextBuffer *buffer;
const char *auth_type = NULL;
- if (!check_validity (self, error))
- return FALSE;
-
s_vpn = NM_SETTING_VPN (nm_setting_vpn_new ());
g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_OPENCONNECT, NULL);
@@ -588,6 +585,9 @@ update_connection (NMVpnPluginUiWidgetInterface *iface,
nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_STOKEN_STRING, str);
}
+ if (!check_validity (self, error))
+ return FALSE;
+
/* These are different for every login session, and should not be stored */
nm_setting_set_secret_flags (NM_SETTING (s_vpn), "gwcert",
NM_SETTING_SECRET_FLAG_NOT_SAVED, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]