network-manager-applet r902 - in trunk: . src/gconf-helpers

[dcbw svn gnome org]

Author: dcbw
Date: Wed Sep 24 16:48:42 2008
New Revision: 902
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=902&view=rev

Log:
2008-09-24  Dan Williams  <dcbw redhat com>

	* src/gconf-helpers/gconf-helpers.c
		- (write_one_secret_to_keyring): silence warning about VPN secrets, which
			don't get written to the keyring by the generic GConf helper code,
			but instead by the VPN plugins themselves



Modified:
   trunk/ChangeLog
   trunk/src/gconf-helpers/gconf-helpers.c

Modified: trunk/src/gconf-helpers/gconf-helpers.c
==============================================================================
--- trunk/src/gconf-helpers/gconf-helpers.c	(original)
+++ trunk/src/gconf-helpers/gconf-helpers.c	Wed Sep 24 16:48:42 2008
@@ -1207,6 +1207,12 @@
 		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;
+
 	secret = g_value_get_string (value);
 	if (secret && strlen (secret)) {
 		nm_gconf_add_keyring_item (info->connection_uuid,