region: Fix infinite loop when selecting Xkb options

Spotted by Arun Raghavan <arun.raghavan@collabora.co.uk>

https://bugzilla.gnome.org/show_bug.cgi?id=639951
This commit is contained in:
Bastien Nocera 2011-01-19 14:51:34 +00:00
parent c9ebbd57da
commit 978ae121f2

View file

@ -111,14 +111,16 @@ static void
xkb_options_select (gchar * optionname) xkb_options_select (gchar * optionname)
{ {
gboolean already_selected = FALSE; gboolean already_selected = FALSE;
gchar **options_list = xkb_options_get_selected_list (); gchar **options_list;
if (options_list != NULL) { guint i;
gchar **option = options_list;
while (*option != NULL) options_list = xkb_options_get_selected_list ();
if (!strcmp (*option, optionname)) { for (i = 0; options_list != NULL && options_list[i] != NULL; i++) {
already_selected = TRUE; gchar *option = options_list[i];
break; if (!strcmp (option, optionname)) {
} already_selected = TRUE;
break;
}
} }
if (!already_selected) { if (!already_selected) {