[xfce4-session] Add patch to fix LANG handling with new gdm. Fixes #683941

[Kevin Fenzi]

commit a03a50e824254a49b9de74c9d75049a0c297f8bc
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Thu Mar 10 11:46:55 2011 -0700

    Add patch to fix LANG handling with new gdm. Fixes #683941

 xfce4-session-4.8.1-gdmlang.patch |   17 +++++++++++++++++
 xfce4-session.spec                |    9 +++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/xfce4-session-4.8.1-gdmlang.patch b/xfce4-session-4.8.1-gdmlang.patch
new file mode 100644
index 0000000..f98f5fb
--- /dev/null
+++ b/xfce4-session-4.8.1-gdmlang.patch
@@ -0,0 +1,17 @@
+Only use GDM_LANG if not empty
+
+gdm >= 2.91 sets GDM_LANG to an empty string which xfce-session
+ends up using, overriding existing good LANG and breaking up utf8 etc.
+
+diff -up xfce4-session-4.8.1/xfce4-session/main.c.gdmlang xfce4-session-4.8.1/xfce4-session/main.c
+--- xfce4-session-4.8.1/xfce4-session/main.c.gdmlang	2011-03-10 15:59:08.000000000 +0200
++++ xfce4-session-4.8.1/xfce4-session/main.c	2011-03-10 15:59:30.000000000 +0200
+@@ -103,7 +103,7 @@ setup_environment (void)
+ 
+   /* this is for compatibility with the GNOME Display Manager */
+   lang = g_getenv ("GDM_LANG");
+-  if (lang != NULL)
++  if (lang != NULL && strlen (lang) > 0)
+     {
+       xfce_setenv ("LANG", lang, TRUE);
+       xfce_unsetenv ("GDM_LANG");
diff --git a/xfce4-session.spec b/xfce4-session.spec
index a076251..6ab4f53 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -2,7 +2,7 @@
 
 Name:           xfce4-session
 Version:        4.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Xfce session manager
 
 Group:          User Interface/Desktops
@@ -12,6 +12,7 @@ Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-
 Patch0:         xfce4-session-4.7.2-hide-tips.patch
 # http://patches.ubuntu.com/x/xfce4-session/extracted/01_correct_shadows.patch
 Patch1:         xfce4-session-4.6.1-correct-shadows.patch
+Patch2:		xfce4-session-4.8.1-gdmlang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  dbus-devel 
@@ -62,6 +63,7 @@ Additional splash screen engines for the Xfce Session Manager.
 %setup -q
 %patch0 -p1 -b .hide-tips
 %patch1 -p1 -b .correct-shadows
+%patch2 -p1 -b .gdm-lang
 
 
 %build
@@ -146,9 +148,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/themes/Default/balou/
 
 %changelog
+* Thu Mar 10 2011 Kevin Fenzi <kevin at tummy.com> - 4.8.1-3
+- Add patch to fix LANG handling with new gdm. Fixes #683941
+
 * Tue Feb 15 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-2
 - Fix versioning of the devel package's requirements
-
+ 
 * Mon Feb 14 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-1
 - Update to 4.8.1