From 1d484ea37a866a8edca7447566e3fd52ed393878 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Mar 09 2008 23:48:54 +0000
Subject: - Don't set keyboard model on startup from gconf if evdev is being used.

    Evdev needs to use its own keyboard model to work right.

---

diff --git a/gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch b/gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
new file mode 100644
index 0000000..9cb9b40
--- /dev/null
+++ b/gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
@@ -0,0 +1,17 @@
+diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
+index a633167..7896d85 100644
+--- a/plugins/keyboard/gsd-keyboard-xkb.c
++++ b/plugins/keyboard/gsd-keyboard-xkb.c
+@@ -152,6 +152,12 @@ apply_xkb_settings (void)
+ 
+         gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
+                                                   NULL);
++        /* Ignore model if using evdev, since evdev needs its own model
++         */
++        if (strcmp (initial_sys_kbd_config.model, "evdev") == 0) {
++                g_free (current_kbd_config.model);
++                current_kbd_config.model = g_strdup ("evdev");
++        }
+         /* Activate - only if different! */
+         if (!gkbd_keyboard_config_equals
+             (&current_kbd_config, &current_sys_kbd_config)) {
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 8826119..efe6c5b 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.21.92
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -29,6 +29,7 @@ BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser)
 
 Patch1:         add-randr-12.patch
+Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -49,6 +50,7 @@ developing applications that use %{name}.
 %setup -q
 
 %patch1 -p1 -b .add-randr-12
+%patch2 -p1 -b .ignore-layout-if-using-evdev
 
 %build
 %configure --enable-static=no
@@ -123,6 +125,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Sun Mar  9 2008 Ray Strode <rstrode@redhat.com> - 2.21.92-3
+- Don't set keyboard model on startup from gconf if evdev is being used.
+  Evdev needs to use its own keyboard model to work right.
+
 * Sun Mar  2 2008 Soren Sandmann <sandmann@redhat.com> - 2.21.92-2
 - Update randr patch to handle video key