rpms/gnome-settings-daemon/devel gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.12, 1.13

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16166

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch 
Log Message:
- 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.


gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch:

--- NEW FILE gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch ---
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)) {


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-settings-daemon.spec	2 Mar 2008 22:21:35 -0000	1.12
+++ gnome-settings-daemon.spec	9 Mar 2008 23:48:54 -0000	1.13
@@ -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:	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 @@
 %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 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Sun Mar  9 2008 Ray Strode <rstrode at 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 at redhat.com> - 2.21.92-2
 - Update randr patch to handle video key