From 1aa2a619011b9ab08100c7bc4caca15f3445ca8b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Oct 23 2009 20:22:23 +0000
Subject: - Properly read default keyboard layout (bug 530452)


---

diff --git a/gdm-system-keyboard.patch b/gdm-system-keyboard.patch
index 7641129..b260199 100644
--- a/gdm-system-keyboard.patch
+++ b/gdm-system-keyboard.patch
@@ -80,7 +80,7 @@ diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/daemon/gdm-session-direct.c 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 {
diff --git a/gdm.spec b/gdm.spec
index 0fb9d20..5063717 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -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@redhat.com> 2.28.1-6
+- Properly read default keyboard layout (bug 530452)
+
 * Fri Oct 23 2009 Ray Strode <rstrode@redhat.com> 2.28.1-5
 - Remove tool tip from login button