[gdm] Only set GDM_KEYBOARD_LAYOUT if layout is not-default

[Ray Strode <halfline src gnome org>]

commit 4b177ed3c1998d9cd2f203f5c635b3f73ca4aecd
Author: Ray Strode <rstrode redhat com>
Date:   Thu Jul 16 21:37:22 2009 -0400

    Only set GDM_KEYBOARD_LAYOUT if layout is not-default
    
    If it's default then the right thing should automatically
    anyway.
    
    See http://bugzilla.gnome.org/show_bug.cgi?id=572765

 daemon/gdm-session-direct.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 4915ca5..64b217a 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -1961,9 +1961,12 @@ setup_session_environment (GdmSessionDirect *session)
                                                      "GDM_LANG",
                                                      get_language_name (session));
 
-        gdm_session_direct_set_environment_variable (session,
-                                                     "GDM_KEYBOARD_LAYOUT",
-                                                     get_layout_name (session));
+        if (strcmp (get_layout_name (session),
+                    get_default_layout_name (session)) == 0) {
+                gdm_session_direct_set_environment_variable (session,
+                                                             "GDM_KEYBOARD_LAYOUT",
+                                                             get_layout_name (session));
+        }
 
         gdm_session_direct_set_environment_variable (session,
                                                      "DISPLAY",