diff options
author | Cosimo Cecchi <cosimo@endlessm.com> | 2016-05-24 11:10:34 -0700 |
---|---|---|
committer | Cosimo Cecchi <cosimo@endlessm.com> | 2016-05-25 11:00:41 -0700 |
commit | b3199dd641602474c1a0145eac4de441827c61d2 (patch) | |
tree | fffe3563f10ed6dd636f028d993ed4faace5edb1 | |
parent | 02298c1d431a203fffb9e717dd62a60e8f526475 (diff) | |
download | gnome-control-center-b3199dd641602474c1a0145eac4de441827c61d2.tar.gz |
region: remove handling of current input source GSetting
This is not read anymore by gnome-shell or gnome-settings-daemon, and
there's no point for gnome-control-center to read or write it anymore.
https://bugzilla.gnome.org/show_bug.cgi?id=766846
-rw-r--r-- | panels/region/cc-region-panel.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c index f1b3356bc..c6084f2d2 100644 --- a/panels/region/cc-region-panel.c +++ b/panels/region/cc-region-panel.c @@ -50,7 +50,6 @@ #include <libgd/gd-notification.h> #define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources" -#define KEY_CURRENT_INPUT_SOURCE "current" #define KEY_INPUT_SOURCES "sources" #define GNOME_SYSTEM_LOCALE_DIR "org.gnome.system.locale" @@ -1049,46 +1048,19 @@ set_input_settings (CcRegionPanel *self) const gchar *type; const gchar *id; GVariantBuilder builder; - GVariant *old_sources; - const gchar *old_current_type; - const gchar *old_current_id; - guint old_current; - guint old_n_sources; - guint index; GList *list, *l; - old_sources = g_settings_get_value (priv->input_settings, KEY_INPUT_SOURCES); - old_current = g_settings_get_uint (priv->input_settings, KEY_CURRENT_INPUT_SOURCE); - old_n_sources = g_variant_n_children (old_sources); - - if (old_n_sources > 0 && old_current < old_n_sources) { - g_variant_get_child (old_sources, old_current, - "(&s&s)", &old_current_type, &old_current_id); - } else { - old_current_type = ""; - old_current_id = ""; - } - g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)")); - index = 0; list = gtk_container_get_children (GTK_CONTAINER (priv->input_list)); for (l = list; l; l = l->next) { type = (const gchar *)g_object_get_data (G_OBJECT (l->data), "type"); id = (const gchar *)g_object_get_data (G_OBJECT (l->data), "id"); - if (index != old_current && - g_str_equal (type, old_current_type) && - g_str_equal (id, old_current_id)) { - g_settings_set_uint (priv->input_settings, KEY_CURRENT_INPUT_SOURCE, index); - } g_variant_builder_add (&builder, "(ss)", type, id); - index += 1; } g_list_free (list); g_settings_set_value (priv->input_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder)); g_settings_apply (priv->input_settings); - - g_variant_unref (old_sources); } static void set_localed_input (CcRegionPanel *self); |