summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Matos <tiagomatos@gmail.com>2013-04-01 17:39:40 +0200
committerRui Matos <tiagomatos@gmail.com>2013-04-03 19:14:18 +0200
commit8b94e4230d63bffcc48cca42f0a872a5a2833d9f (patch)
tree80aac7b1a153b3f551945ed7d9e2fc7daede3b96
parentdf7d27c141459d78bebea6e88c36b62691c5c580 (diff)
downloadgnome-settings-daemon-wip/is-switch-fixes.tar.gz
keyboard: Convert the XKB group switch option from libgnomekbdwip/is-switch-fixes
We can now use this to switch input sources so there's no reason to not convert it.
-rw-r--r--plugins/keyboard/gsd-keyboard-manager.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index 93a1dbe0..3aa83110 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -1384,13 +1384,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);