rpms/gdm/F-12 gdm-system-keyboard.patch, 1.5, 1.6 gdm.spec, 1.500, 1.501

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25641

Modified Files:
	gdm-system-keyboard.patch gdm.spec 
Log Message:
- Properly read default keyboard layout (bug 530452)


gdm-system-keyboard.patch:
 configure.ac                |    1 
 daemon/gdm-session-direct.c |   81 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 79 insertions(+), 3 deletions(-)

Index: gdm-system-keyboard.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-system-keyboard.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdm-system-keyboard.patch	1 Oct 2009 14:20:57 -0000	1.5
+++ gdm-system-keyboard.patch	23 Oct 2009 20:22:22 -0000	1.6
@@ -80,7 +80,7 @@ diff -Nur -x '*.orig' -x '*~' gdm-2.28.0
 +                                                        NULL);
 +        }
 +
-+	if (variant) {
++	if (variant != NULL && variant[0] != '\0') {
 +	    result = g_strdup_printf("%s\t%s", layout, variant);
 +	    libhal_free_string (variant);
 +	} else {


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -p -r1.500 -r1.501
--- gdm.spec	23 Oct 2009 16:55:46 -0000	1.500
+++ gdm.spec	23 Oct 2009 20:22:23 -0000	1.501
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -405,6 +405,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-6
+- Properly read default keyboard layout (bug 530452)
+
 * Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-5
 - Remove tool tip from login button