[gnome-settings-daemon/gnome-3-8] keyboard: Convert the XKB group switch option from libgnomekbd

[Rui Matos <rtcm src gnome org>]

commit cf544fcd647a9e2efe86fe58f11d8f57d908f202
Author: Rui Matos <tiagomatos gmail com>
Date:   Mon Apr 1 17:39:40 2013 +0200

    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

 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 2c52d6f..61bea63 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);