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

[dcbw svn gnome org]

Author: dcbw
Date: Wed Apr 30 03:06:06 2008
New Revision: 708
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=708&view=rev

Log:
2008-04-29  Dan Williams  <dcbw redhat com>

	* gconf-helpers/gconf-helpers.c
		- (copy_one_setting_value_to_gconf): write the 'name' key to GConf too;
			because of the default-value removal code, and because GConf will
			automatically delete directories that are empty, we need to make
			sure that some directories stick around.  For example, PPPoE
			connections need the PPP setting too, but if it's all default
			values GConf will remove it.



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 Apr 30 03:06:06 2008
@@ -784,7 +784,7 @@
 	ReadFromGConfInfo *info = (ReadFromGConfInfo *) user_data;
 	GType type = G_VALUE_TYPE (value);
 
-	/* The 'name' key isn't pulled from GConf because it's pulled from the
+	/* The 'name' key is ignored when reading, because it's pulled from the
 	 * gconf directory name instead.
 	 */
 	if (!strcmp (key, NM_SETTING_NAME))
@@ -1059,12 +1059,6 @@
 	GType type = G_VALUE_TYPE (value);
 	GParamSpec *pspec;
 
-	/* The 'name' key isn't written to GConf because it's pulled from the
-	 * gconf directory name instead.
-	 */
-	if (!strcmp (key, NM_SETTING_NAME))
-		return;
-
 	/* Some keys (like certs) aren't written directly to GConf but are handled
 	 * separately.
 	 */