[gnome-settings-daemon/wip/is-switch-fixes: 4/5] keyboard: Make sure the XKB group in use is always what we want

[Rui Matos <rtcm src gnome org>]

commit df7d27c141459d78bebea6e88c36b62691c5c580
Author: Rui Matos <tiagomatos gmail com>
Date:   Sun Mar 31 21:56:01 2013 +0200

    keyboard: Make sure the XKB group in use is always what we want
    
    The layout we want is always in the first XKB group index so we should
    enforce it to make sure we never end up with the wrong one.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=696996

 plugins/keyboard/gsd-keyboard-manager.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index 48a8706..93a1dbe 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -696,6 +696,11 @@ upload_xkb_description (const gchar          *rules_file_path,
         XkbDescRec *xkb_desc;
         gchar *rules_file;
 
+        /* The layout we want is always in the first XKB group index
+         * so we should enforce it to make sure we never end up with
+         * the wrong one. */
+        XkbLockGroup (display, XkbUseCoreKbd, 0);
+
         /* Upload it to the X server using the same method as setxkbmap */
         xkb_desc = XkbGetKeyboardByName (display,
                                          XkbUseCoreKbd,