applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

region: remove handling of current input source GSetting

Browse source 
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
This commit is contained in:
Cosimo Cecchi 2016-05-24 11:10:34 -07:00
parent 02298c1d43
commit b3199dd641
1 changed files with 0 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

28
panels/region/cc-region-panel.c
View file

@ -50,7 +50,6 @@
#include <libgd/gd-notification.h> #include <libgd/gd-notification.h>
#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources" #define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources"
#define KEY_CURRENT_INPUT_SOURCE "current"
#define KEY_INPUT_SOURCES "sources" #define KEY_INPUT_SOURCES "sources"
#define GNOME_SYSTEM_LOCALE_DIR "org.gnome.system.locale" #define GNOME_SYSTEM_LOCALE_DIR "org.gnome.system.locale"
@ -1049,46 +1048,19 @@ set_input_settings (CcRegionPanel *self)
const gchar *type; const gchar *type;
const gchar *id; const gchar *id;
GVariantBuilder builder; 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; 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)")); g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
index = 0;
list = gtk_container_get_children (GTK_CONTAINER (priv->input_list)); list = gtk_container_get_children (GTK_CONTAINER (priv->input_list));
for (l = list; l; l = l->next) { for (l = list; l; l = l->next) {
type = (const gchar *)g_object_get_data (G_OBJECT (l->data), "type"); type = (const gchar *)g_object_get_data (G_OBJECT (l->data), "type");
id = (const gchar *)g_object_get_data (G_OBJECT (l->data), "id"); 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); g_variant_builder_add (&builder, "(ss)", type, id);
index += 1;
} }
g_list_free (list); g_list_free (list);
g_settings_set_value (priv->input_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder)); g_settings_set_value (priv->input_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
g_settings_apply (priv->input_settings); g_settings_apply (priv->input_settings);
g_variant_unref (old_sources);
} }
static void set_localed_input (CcRegionPanel *self); static void set_localed_input (CcRegionPanel *self);