[gnome-terminal] Always unlock the accel path before trying to change it

[Christian Persch <chpe src gnome org>]

commit b43fcdfd20c6eb4f972333080a435ba8567cc6fa
Author: Christian Persch <chpe gnome org>
Date:   Tue Jul 21 21:24:53 2009 +0200

    Always unlock the accel path before trying to change it
    
    Unlock before, then lock the path afterwards if the gconf key isn't writable.
    Bug #583690.

 src/terminal-accels.c |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
index d3dd3f7..e7d8567 100644
--- a/src/terminal-accels.c
+++ b/src/terminal-accels.c
@@ -104,7 +104,7 @@ typedef struct
   GClosure *closure;
   /* have gotten a notification from gtk */
   gboolean needs_gconf_sync;
-  gboolean gconf_writable;
+  gboolean accel_path_unlocked;
 } KeyEntry;
 
 typedef struct
@@ -397,7 +397,6 @@ keys_change_notify (GConfClient *client,
   KeyEntry *key_entry;
   GdkModifierType mask;
   guint keyval;
-  gboolean gconf_writable;
 
   _terminal_debug_print (TERMINAL_DEBUG_ACCELS,
                          "key %s changed\n",
@@ -440,15 +439,9 @@ keys_change_notify (GConfClient *client,
   key_entry->gconf_keyval = keyval;
   key_entry->gconf_mask = mask;
 
-  gconf_writable = gconf_entry_get_is_writable (entry);
-  if (gconf_writable != key_entry->gconf_writable)
-    {
-      if (gconf_writable)
-        gtk_accel_map_unlock_path (key_entry->accel_path);
-      else
-        gtk_accel_map_lock_path (key_entry->accel_path);
-    }
-  key_entry->gconf_writable = gconf_writable;
+  /* Unlock the path, so we can change its accel */
+  if (!key_entry->accel_path_unlocked)
+    gtk_accel_map_unlock_path (key_entry->accel_path);
 
   /* sync over to GTK */
   _terminal_debug_print (TERMINAL_DEBUG_ACCELS,
@@ -462,6 +455,11 @@ keys_change_notify (GConfClient *client,
                               TRUE);
   inside_gconf_notify -= 1;
 
+  /* Lock the path if the gconf key isn't writable */
+  key_entry->accel_path_unlocked = gconf_entry_get_is_writable (entry);
+  if (!key_entry->accel_path_unlocked)
+    gtk_accel_map_lock_path (key_entry->accel_path);
+
   /* This seems necessary to update the tree model, since sometimes the
    * notification on the notification_group seems not to be emitted correctly.
    * Without this change, when trying to set an accel to e.g. Alt-T (while the main
@@ -631,8 +629,8 @@ accel_set_func (GtkTreeViewColumn *tree_column,
   else
     g_object_set (cell,
                   "visible", TRUE,
-                  "sensitive", ke->gconf_writable,
-                  "editable", ke->gconf_writable,
+                  "sensitive", ke->accel_path_unlocked,
+                  "editable", ke->accel_path_unlocked,
                   "accel-key", ke->gconf_keyval,
                   "accel-mods", ke->gconf_mask,
 		  NULL);