[network-manager-applet/NETWORKMANAGER_APPLET_0_7] gconf: fix misleading warning about unhandled secrets (rh #497609)



commit 61312a7d01b07edb1f2b1ec218d1cb60459af8d3
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Apr 28 17:00:01 2009 -0400

    gconf: fix misleading warning about unhandled secrets (rh #497609)
---
 src/gconf-helpers/gconf-helpers.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gconf-helpers/gconf-helpers.c b/src/gconf-helpers/gconf-helpers.c
index afb8239..a32cc45 100644
--- a/src/gconf-helpers/gconf-helpers.c
+++ b/src/gconf-helpers/gconf-helpers.c
@@ -1316,18 +1316,18 @@ write_one_secret_to_keyring (NMSetting *setting,
 
 	setting_name = nm_setting_get_name (setting);
 
-	if (type != G_TYPE_STRING) {
-		g_warning ("Unhandled setting secret type (write) '%s/%s' : '%s'", 
-				 setting_name, key, g_type_name (type));
-		return;
-	}
-
 	/* VPN secrets are handled by the VPN plugins */
 	if (   (type == DBUS_TYPE_G_MAP_OF_STRING)
 	    && NM_IS_SETTING_VPN (setting)
 	    && !strcmp (key, NM_SETTING_VPN_SECRETS))
 		return;
 
+	if (type != G_TYPE_STRING) {
+		g_warning ("Unhandled setting secret type (write) '%s/%s' : '%s'", 
+				 setting_name, key, g_type_name (type));
+		return;
+	}
+
 	secret = g_value_get_string (value);
 	if (secret && strlen (secret)) {
 		nm_gconf_add_keyring_item (info->connection_uuid,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]