rpms/gnome-settings-daemon/devel keyboard-layout-variants.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.52, 1.53

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9310

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	keyboard-layout-variants.patch 
Log Message:
try harder to keep gdms keyboard layout


keyboard-layout-variants.patch:

--- NEW FILE keyboard-layout-variants.patch ---
--- gnome-settings-daemon-2.23.91/plugins/keyboard/gsd-keyboard-xkb.c	2008-09-05 18:49:58.000000000 -0400
+++ hacked/plugins/keyboard/gsd-keyboard-xkb.c	2008-09-05 18:48:11.000000000 -0400
@@ -172,7 +172,9 @@
                          GSList *l;
                          int i;
                          for (i = 0, l = current_kbd_config.layouts_variants; l; i++, l = l->next) {
-                                 if (strcmp (gdm_keyboard_layout, l->data) == 0) {
+                                 char *lv = l->data;
+                                 size_t len = strlen (gdm_keyboard_layout);
+                                 if (strncmp (lv, gdm_keyboard_layout, len) == 0 && (lv[len] == '\0' || lv[len] == '\t')) {
                                         xkl_engine_lock_group (current_config.engine, i);
                                         break;
                                  }


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-settings-daemon.spec	4 Sep 2008 19:36:21 -0000	1.52
+++ gnome-settings-daemon.spec	6 Sep 2008 00:08:22 -0000	1.53
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.23.91
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -34,6 +34,8 @@
 Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
 Patch6:		gnome-settings-daemon-2.23.4-drop-sample-cache.patch
 Patch7:		gnome-settings-daemon-2.23.91-fnf7-cycle.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=551062 
+Patch11:	keyboard-layout-variants.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -56,6 +58,7 @@
 %patch2 -p1 -b .ignore-layout-if-using-evdev
 %patch6 -p1 -b .drop-sample-cache
 %patch7 -p1 -b .fnf7-cycle
+%patch11 -p1 -b .keyboard-layout-variants
 
 %build
 aclocal
@@ -155,6 +158,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-5
+- Try harder to use the keyboard layout that gdm tells us
+
 * Tue Sep 04 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-4
 - Use the fn-F7 key, not the F7 key.