[gnome-control-center] keyboard: remove some dead code
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] keyboard: remove some dead code
- Date: Mon, 29 Jun 2020 00:31:48 +0000 (UTC)
commit 44959e00495c2a38477f8f69bbbc07005045feb5
Author: Ian Douglas Scott <idscott system76 com>
Date: Fri Jun 26 14:07:14 2020 -0700
keyboard: remove some dead code
panels/keyboard/keyboard-shortcuts.c | 57 ------------------------------------
panels/keyboard/keyboard-shortcuts.h | 18 ------------
2 files changed, 75 deletions(-)
---
diff --git a/panels/keyboard/keyboard-shortcuts.c b/panels/keyboard/keyboard-shortcuts.c
index 424ed6c00..ba748a630 100644
--- a/panels/keyboard/keyboard-shortcuts.c
+++ b/panels/keyboard/keyboard-shortcuts.c
@@ -210,25 +210,6 @@ parse_start_tag (GMarkupParseContext *ctx,
g_array_append_val (keylist->entries, key);
}
-void
-fill_xkb_options_shortcuts (GtkTreeModel *model)
-{
- GList *l;
- GtkTreeIter iter;
-
- for (l = cc_keyboard_option_get_all (); l; l = l->next)
- {
- CcKeyboardOption *option = l->data;
-
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- DETAIL_DESCRIPTION_COLUMN, cc_keyboard_option_get_description (option),
- DETAIL_KEYENTRY_COLUMN, option,
- DETAIL_TYPE_COLUMN, SHORTCUT_TYPE_XKB_OPTION,
- -1);
- }
-}
-
static const guint forbidden_keyvals[] = {
/* Navigation keys */
GDK_KEY_Home,
@@ -332,44 +313,6 @@ find_free_settings_path (GSettings *settings)
return g_steal_pointer (&dir);
}
-static gboolean
-poke_xkb_option_row (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer option)
-{
- gpointer item;
-
- gtk_tree_model_get (model, iter,
- DETAIL_KEYENTRY_COLUMN, &item,
- -1);
-
- if (item != option)
- return FALSE;
-
- gtk_tree_model_row_changed (model, path, iter);
- return TRUE;
-}
-
-static void
-xkb_option_changed (CcKeyboardOption *option,
- gpointer data)
-{
- GtkTreeModel *model = data;
-
- gtk_tree_model_foreach (model, poke_xkb_option_row, option);
-}
-
-void
-setup_keyboard_options (GtkListStore *store)
-{
- GList *l;
-
- for (l = cc_keyboard_option_get_all (); l; l = l->next)
- g_signal_connect_object (l->data, "changed",
- G_CALLBACK (xkb_option_changed), store, 0);
-}
-
KeyList*
parse_keylist_from_file (const gchar *path)
{
diff --git a/panels/keyboard/keyboard-shortcuts.h b/panels/keyboard/keyboard-shortcuts.h
index 26427821a..e303486d4 100644
--- a/panels/keyboard/keyboard-shortcuts.h
+++ b/panels/keyboard/keyboard-shortcuts.h
@@ -57,20 +57,6 @@ typedef struct {
guint new_keycode;
} CcUniquenessData;
-typedef enum
-{
- SHORTCUT_TYPE_KEY_ENTRY,
- SHORTCUT_TYPE_XKB_OPTION,
-} ShortcutType;
-
-enum
-{
- DETAIL_DESCRIPTION_COLUMN,
- DETAIL_KEYENTRY_COLUMN,
- DETAIL_TYPE_COLUMN,
- DETAIL_N_COLUMNS
-};
-
enum
{
SECTION_DESCRIPTION_COLUMN,
@@ -81,10 +67,6 @@ enum
gchar* find_free_settings_path (GSettings *settings);
-void fill_xkb_options_shortcuts (GtkTreeModel *model);
-
-void setup_keyboard_options (GtkListStore *store);
-
gboolean is_valid_binding (CcKeyCombo *combo);
gboolean is_empty_binding (CcKeyCombo *combo);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]