diff options
| author | Rui Matos <tiagomatos@gmail.com> | 2013-04-01 17:39:40 +0200 |
|---|---|---|
| committer | Rui Matos <tiagomatos@gmail.com> | 2013-05-26 18:04:13 +0200 |
| commit | 7207765d3fc19d127fcb1b0095a73130fd249e19 (patch) | |
| tree | b3eef54d78178bdb3a5c17f8e82e918b0b738c4b /plugins/keyboard | |
| parent | 1709bf58a60b76bce77038bb804991447d215f49 (diff) | |
| download | gnome-settings-daemon-7207765d3fc19d127fcb1b0095a73130fd249e19.tar.gz | |
keyboard: Convert the XKB group switch option from libgnomekbd
Mutter and gnome-shell now use this to switch input sources so we
should convert it too.
https://bugzilla.gnome.org/show_bug.cgi?id=700349
Diffstat (limited to 'plugins/keyboard')
| -rw-r--r-- | plugins/keyboard/gsd-keyboard-manager.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c index 2c52d6fb..61bea63b 100644 --- a/plugins/keyboard/gsd-keyboard-manager.c +++ b/plugins/keyboard/gsd-keyboard-manager.c @@ -1345,13 +1345,8 @@ convert_libgnomekbd_options (GSettings *settings) gchar **strv; strv = g_strsplit (*o, "\t", 2); - if (strv[0] && strv[1]) { - /* We don't want the group switcher because - * it's incompatible with the way we use XKB - * groups. */ - if (!g_str_has_prefix (strv[1], "grp:")) - g_ptr_array_add (opt_array, g_strdup (strv[1])); - } + if (strv[0] && strv[1]) + g_ptr_array_add (opt_array, g_strdup (strv[1])); g_strfreev (strv); } g_ptr_array_add (opt_array, NULL); |