From 8b94e4230d63bffcc48cca42f0a872a5a2833d9f Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Mon, 1 Apr 2013 17:39:40 +0200 Subject: keyboard: Convert the XKB group switch option from libgnomekbd We can now use this to switch input sources so there's no reason to not convert it. --- plugins/keyboard/gsd-keyboard-manager.c | 9 ++------- 1 file 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); -- cgit v1.2.1