From 2f7532ddccf3ffe74a679e66aced1a3a28bc6849 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Apr 30 2009 02:13:33 +0000
Subject: Don't rely on _BACKUP property for xkb initialization


---

diff --git a/gdm-xkb-init.patch b/gdm-xkb-init.patch
new file mode 100644
index 0000000..242a779
--- /dev/null
+++ b/gdm-xkb-init.patch
@@ -0,0 +1,15 @@
+diff -up gdm-2.26.1/gui/simple-greeter/gdm-layouts.c.xkb-init gdm-2.26.1/gui/simple-greeter/gdm-layouts.c
+--- gdm-2.26.1/gui/simple-greeter/gdm-layouts.c.xkb-init	2009-04-29 21:27:20.129995831 -0400
++++ gdm-2.26.1/gui/simple-greeter/gdm-layouts.c	2009-04-29 21:28:12.378737969 -0400
+@@ -55,9 +55,9 @@ init_xkl (void)
+                 xkl_config_registry_load (config_registry);
+ 
+                 initial_config = xkl_config_rec_new ();
+-                if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
++                if (!xkl_config_rec_get_from_server (initial_config, engine)) {
+                         g_warning ("failed to load XKB configuration");
+-                        initial_config->model = g_strdup ("pc105");
++                        initial_config->model = g_strdup ("evdev");
+                 }
+         }
+ }
diff --git a/gdm.spec b/gdm.spec
index 4ab1bb3..f274f63 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -92,9 +92,8 @@ Requires: audit-libs >= %{libauditver}
 Patch2: gdm-2.26.0-force-active-vt.patch
 Patch3: gdm-2.23.92-save-root-window.patch
 
-# uses /etc/sysconfig/keyboard and is thus not directly upstreamable
-# should probably be changed to get the system layout from the X server
 Patch13: gdm-system-keyboard.patch
+Patch14: gdm-xkb-init.patch
 
 Patch19: gdm-2.26.1-multistack.patch
 
@@ -143,6 +142,7 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint
 %patch2 -p1 -b .force-active-vt
 %patch3 -p1 -b .save-root-window
 %patch13 -p1 -b .system-keyboard
+%patch14 -p1 -b .xkb-init
 
 %patch19 -p1 -b .multistack
 
@@ -390,6 +390,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.26.1-7
+- Don't rely on _BACKUP property for xkb initialization
+
 * Tue Apr 28 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.26.1-6
 - fix a use-after-free in XDMCP code paths (#496882)