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


---

diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 9b9b5e5..068ca17 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -44,6 +44,8 @@ Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=580616
 Patch13:	compare-keys-carefully.patch
 
+Patch14:	gsd-xkb-init.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -66,6 +68,7 @@ developing applications that use %{name}.
 %patch11 -p1 -b .support-touchpads
 %patch12 -p1 -b .lefthand-touchpad
 %patch13 -p1 -b .compare-keys-carefully
+%patch14 -p1 -b .xkb-init
 
 autoreconf -i -f
 
@@ -178,6 +181,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-4
+- Don't rely on _BACKUP property for xkb initialization
+
 * Wed Apr 29 2009 Matthias Clasen  <mclasen@redhat.com> - 2.26.1-3
 - Make custom keybindings work better (#497725)
 
diff --git a/gsd-xkb-init.patch b/gsd-xkb-init.patch
new file mode 100644
index 0000000..58de266
--- /dev/null
+++ b/gsd-xkb-init.patch
@@ -0,0 +1,12 @@
+diff -up gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c.xkb-init gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c
+--- gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c.xkb-init	2009-04-29 21:42:13.873737299 -0400
++++ gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c	2009-04-29 21:42:23.752987998 -0400
+@@ -234,7 +234,7 @@ gsd_keyboard_xkb_analyze_sysconfig (void
+ 	conf_client = gconf_client_get_default ();
+ 	gkbd_keyboard_config_init (&initial_sys_kbd_config,
+ 				   conf_client, xkl_engine);
+-	gkbd_keyboard_config_load_from_x_initial (&initial_sys_kbd_config,
++	gkbd_keyboard_config_load_from_x_current (&initial_sys_kbd_config,
+ 						  NULL);
+ 	g_object_unref (conf_client);
+ }