From cb3c34466676d0ba87160fbb4337c736708be96e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Jul 01 2009 13:55:22 +0000
Subject: fix for xklavier api changes


---

diff --git a/gdm.spec b/gdm.spec
index 1d31d1c..d5583d4 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -82,7 +82,7 @@ BuildRequires: libselinux-devel
 BuildRequires: check-devel
 BuildRequires: iso-codes-devel
 BuildRequires: gnome-panel-devel
-BuildRequires: libxklavier-devel
+BuildRequires: libxklavier-devel >= 4.0
 
 Provides: service(graphical-login)
 
@@ -102,6 +102,8 @@ Patch20: polkit1.patch
 # fixed upstream, rh 502778
 Patch22: gdm-2.26.0-fix-lang-regex.patch
 
+Patch35: xklavier4.patch
+
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
 
@@ -147,6 +149,7 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint
 %patch19 -p1 -b .multistack
 %patch20 -p1 -b .polkit1
 %patch22 -p1 -b .fix-lang-regex
+%patch35 -p1 -b .xklavier4
 
 %patch99 -p1 -b .fedora-logo
 
diff --git a/xklavier4.patch b/xklavier4.patch
new file mode 100644
index 0000000..d48c8ac
--- /dev/null
+++ b/xklavier4.patch
@@ -0,0 +1,12 @@
+diff -up gdm-2.26.1/gui/simple-greeter/gdm-layouts.c.xklavier4 gdm-2.26.1/gui/simple-greeter/gdm-layouts.c
+--- gdm-2.26.1/gui/simple-greeter/gdm-layouts.c.xklavier4	2009-07-01 09:47:32.546576916 -0400
++++ gdm-2.26.1/gui/simple-greeter/gdm-layouts.c	2009-07-01 09:47:50.848564055 -0400
+@@ -52,7 +52,7 @@ init_xkl (void)
+                 engine = xkl_engine_get_instance (GDK_DISPLAY ());
+                 xkl_engine_backup_names_prop (engine);
+                 config_registry = xkl_config_registry_get_instance (engine);
+-                xkl_config_registry_load (config_registry);
++                xkl_config_registry_load (config_registry, FALSE);
+ 
+                 initial_config = xkl_config_rec_new ();
+                 if (!xkl_config_rec_get_from_backup (initial_config, engine)) {