diff options
| author | Ray Strode <rstrode@redhat.com> | 2009-07-16 21:37:22 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2009-07-16 21:37:22 -0400 |
| commit | 4b177ed3c1998d9cd2f203f5c635b3f73ca4aecd (patch) | |
| tree | d95ad47e24d50a8479edb7388c38524ad4c243f2 | |
| parent | 5f8723c4fccff6aed79edbe635e3e16fa74a42d1 (diff) | |
| download | gdm-4b177ed3c1998d9cd2f203f5c635b3f73ca4aecd.tar.gz | |
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
| -rw-r--r-- | 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 4915ca5d..64b217aa 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", |