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

region: Handle the case of an empty input sources list

Browse source 
We would end up in an endless loop on update.

https://bugzilla.gnome.org/show_bug.cgi?id=683879
This commit is contained in:
Rui Matos 2012-09-08 18:25:50 +02:00
parent ff5767b9cb
commit fb6881d53b
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
panels/region/gnome-region-panel-input.c
View file

@ -585,26 +585,25 @@ update_configuration (GtkTreeModel *model)
const gchar *old_current_type; const gchar *old_current_type;
const gchar *old_current_id; const gchar *old_current_id;
guint old_current_index; guint old_current_index;
guint old_n_sources;
guint index; guint index;
old_sources = g_settings_get_value (input_sources_settings, KEY_INPUT_SOURCES); old_sources = g_settings_get_value (input_sources_settings, KEY_INPUT_SOURCES);
old_current_index = g_settings_get_uint (input_sources_settings, KEY_CURRENT_INPUT_SOURCE); old_current_index = g_settings_get_uint (input_sources_settings, KEY_CURRENT_INPUT_SOURCE);
old_n_sources = g_variant_n_children (old_sources);
if (old_n_sources > 0 && old_current_index < old_n_sources)
{
g_variant_get_child (old_sources, g_variant_get_child (old_sources,
old_current_index, old_current_index,
"(&s&s)", "(&s&s)",
&old_current_type, &old_current_type,
&old_current_id); &old_current_id);
if (g_variant_n_children (old_sources) < 1)
{
g_warning ("No input source configured, resetting");
g_settings_reset (input_sources_settings, KEY_INPUT_SOURCES);
goto exit;
} }
if (old_current_index >= g_variant_n_children (old_sources)) else
{ {
g_settings_set_uint (input_sources_settings, old_current_type = "";
KEY_CURRENT_INPUT_SOURCE, old_current_id = "";
g_variant_n_children (old_sources) - 1);
} }
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)")); g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
@ -630,9 +629,8 @@ update_configuration (GtkTreeModel *model)
while (gtk_tree_model_iter_next (model, &iter)); while (gtk_tree_model_iter_next (model, &iter));
g_settings_set_value (input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder)); g_settings_set_value (input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
exit:
g_settings_apply (input_sources_settings); g_settings_apply (input_sources_settings);
g_variant_unref (old_sources); g_variant_unref (old_sources);
} }