[gnome-control-center] keyboard: Remove broken allowed_keys checks
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] keyboard: Remove broken allowed_keys checks
- Date: Thu, 20 Oct 2011 09:39:16 +0000 (UTC)
commit cb5924adb10bdfaaa7ce77565020124050099c24
Author: Bastien Nocera <hadess hadess net>
Date: Thu Oct 20 10:33:51 2011 +0100
keyboard: Remove broken allowed_keys checks
The only thing it was doing was disabling the add button,
which was promptly re-enabled when you selected the custom
shortcuts section.
panels/keyboard/keyboard-shortcuts.c | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/panels/keyboard/keyboard-shortcuts.c b/panels/keyboard/keyboard-shortcuts.c
index c63dd48..dcbd08d 100644
--- a/panels/keyboard/keyboard-shortcuts.c
+++ b/panels/keyboard/keyboard-shortcuts.c
@@ -1889,6 +1889,7 @@ setup_dialog (CcPanel *panel, GtkBuilder *builder)
"/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);
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (model),
@@ -1917,21 +1918,6 @@ setup_dialog (CcPanel *panel, GtkBuilder *builder)
G_CALLBACK (shortcut_selection_changed),
WID (builder, "remove-toolbutton"));
- /* FIXME those use GSettings now */
- allowed_keys = gconf_client_get_list (client,
- GCONF_BINDING_DIR "/allowed_keys",
- GCONF_VALUE_STRING,
- NULL);
- if (allowed_keys != NULL)
- {
- g_slist_foreach (allowed_keys, (GFunc)g_free, NULL);
- g_slist_free (allowed_keys);
- gtk_widget_set_sensitive (WID (builder, "add-toolbutton"),
- FALSE);
- }
-
- g_object_unref (client);
-
/* setup the custom shortcut dialog */
custom_shortcut_dialog = WID (builder,
"custom-shortcut-dialog");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]