gnome-terminal r3231 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Sat Nov 29 22:25:48 2008
New Revision: 3231
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3231&view=rev

Log:
Mark all props as locked initially. That way, if GConf borks (e.g. bug

Modified:
   trunk/src/terminal-profile.c

Modified: trunk/src/terminal-profile.c
==============================================================================
--- trunk/src/terminal-profile.c	(original)
+++ trunk/src/terminal-profile.c	Sat Nov 29 22:25:48 2008
@@ -533,8 +533,9 @@
     return;
 
   _terminal_debug_print (TERMINAL_DEBUG_PROFILE,
-                         "GConf notification for key %s\n",
-                         key);
+                         "GConf notification for key %s [%s]\n",
+                         key,
+                         gconf_entry_get_is_writable (entry) ? "writable" : "LOCKED");
 
   key += strlen (priv->profile_dir);
   if (!key[0])
@@ -923,7 +924,12 @@
   priv->conf = gconf_client_get_default ();
 
   priv->locked = g_new0 (gboolean, LAST_PROP);
-  priv->locked[PROP_NAME] = TRUE;
+
+  /* Lock all props by default. If GConf is working and allows writing
+   * to the resp. keys, we'll unlock in the notification handler.
+   */
+  for (i = 0; i < LAST_PROP; ++i)
+    priv->locked[i] = TRUE;
 
   priv->properties = g_value_array_new (LAST_PROP);
   for (i = 0; i < LAST_PROP; ++i)