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

region: fixed regression: automatically add grp:* if necessary

Browse source 
If Nlayouts > 1, the layout switchit shortcut is defined automatically
This commit is contained in:
Sergey V. Udaltsov 2011-03-16 00:42:49 +00:00
parent 069c35d84e
commit 0c4f98dd94
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
panels/region/gnome-region-panel-xkblt.c
View file

@ -184,7 +184,6 @@ xkb_layouts_row_inserted (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkBuilder *dialog)
{
g_message ("row inserted");
update_layouts_list (tree_model, dialog);
}
@ -193,7 +192,6 @@ xkb_layouts_row_deleted (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkBuilder *dialog)
{
g_message ("row deleted");
update_layouts_list (tree_model, dialog);
}
@ -204,7 +202,6 @@ xkb_layouts_row_reordered (GtkTreeModel *tree_model,
gpointer new_order,
GtkBuilder *dialog)
{
g_message ("row reordered");
update_layouts_list (tree_model, dialog);
}
@ -322,6 +319,21 @@ xkb_layouts_fill_selected_tree (GtkBuilder * dialog)
}
}
static void
add_default_switcher_if_necessary ()
{
gchar **layouts_list = xkb_layouts_get_selected_list();
gchar **options_list = xkb_options_get_selected_list ();
gboolean was_appended;
options_list =
gkbd_keyboard_config_add_default_switch_option_if_necessary
(layouts_list, options_list, &was_appended);
if (was_appended)
xkb_options_set_selected_list (options_list);
g_strfreev (options_list);
}
static void
chooser_response (GtkDialog *chooser,
int response_id,
@ -339,6 +351,7 @@ chooser_response (GtkDialog *chooser,
SEL_LAYOUT_TREE_COL_ID, id,
SEL_LAYOUT_TREE_COL_ENABLED, TRUE,
-1);
add_default_switcher_if_necessary ();
}
xkb_layout_chooser_response (chooser, response_id);