[gnome-control-center] keyboard: Stop monitoring num-workspaces

[Bastien Nocera <hadess src gnome org>]

commit 246a44ce6c87bb0a51ddbc368c2b504f971e54cb
Author: Florian MÃllner <fmuellner gnome org>
Date:   Wed Nov 9 03:53:35 2011 +0100

    keyboard: Stop monitoring num-workspaces
    
    Metacity/Mutter no longer have conditional shortcuts depending on
    the number of workspaces, so there is no need to monitor the
    num-workspaces settings (and reload all keybindings).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=663431

 panels/keyboard/keyboard-shortcuts.c |   23 -----------------------
 1 files changed, 0 insertions(+), 23 deletions(-)
---
diff --git a/panels/keyboard/keyboard-shortcuts.c b/panels/keyboard/keyboard-shortcuts.c
index d3076a3..16d1998 100644
--- a/panels/keyboard/keyboard-shortcuts.c
+++ b/panels/keyboard/keyboard-shortcuts.c
@@ -76,7 +76,6 @@ static GtkWidget *custom_shortcut_command_entry = NULL;
 static GHashTable *kb_system_sections = NULL;
 static GHashTable *kb_apps_sections = NULL;
 static GHashTable *kb_user_sections = NULL;
-static guint workspace_num_notify_id = 0;
 
 static void
 free_key_array (GPtrArray *keys)
@@ -1366,15 +1365,6 @@ accel_cleared_callback (GtkCellRendererText *cell,
   g_object_set (G_OBJECT (item), "binding", "", NULL);
 }
 
-static void
-key_entry_controlling_key_changed (GConfClient *client,
-                                   guint        cnxn_id,
-                                   GConfEntry  *entry,
-                                   gpointer     user_data)
-{
-  reload_sections (user_data);
-}
-
 /* this handler is used to keep accels from activating while the user
  * is assigning a new shortcut so that he won't accidentally trigger one
  * of the widgets */
@@ -1797,11 +1787,6 @@ setup_dialog (CcPanel *panel, GtkBuilder *builder)
   gtk_tree_view_column_set_sort_column_id (column, DETAIL_KEYENTRY_COLUMN);
 
   gconf_client_add_dir (client, GCONF_BINDING_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-  gconf_client_add_dir (client, "/apps/metacity/general", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-  workspace_num_notify_id = gconf_client_notify_add (client,
-                                                     "/apps/metacity/general/num_workspaces",
-                                                     (GConfClientNotifyFunc) key_entry_controlling_key_changed,
-                                                     builder, NULL, NULL);
   g_object_unref (client);
 
   model = gtk_list_store_new (DETAIL_N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER);
@@ -1896,13 +1881,5 @@ keyboard_shortcuts_dispose (CcPanel *panel)
           g_hash_table_destroy (kb_user_sections);
           kb_user_sections = NULL;
         }
-      if (workspace_num_notify_id != 0)
-        {
-          GConfClient *client;
-          client = gconf_client_get_default ();
-          gconf_client_notify_remove (client, workspace_num_notify_id);
-          workspace_num_notify_id = 0;
-          g_object_unref (client);
-        }
     }
 }