r28444 - in /desktop/experimental/gdm3/debian: changelog patches/01_language.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Jun 14 22:30:47 2011
New Revision: 28444

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28444
Log:
01_language.patch: replaced by a new version from upstream. Only 
sets the variables when non-empty.

Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/patches/01_language.patch

Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=28444&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Tue Jun 14 22:30:47 2011
@@ -15,6 +15,8 @@
     + 20_switch_kill_greeter.patch: here is the code that kills the 
       unnecessary greeter if we support -novtswitch.
   * Pass --with-vt-switch-workaround on non-Linux architectures.
+  * 01_language.patch: replaced by a new version from upstream. Only 
+    sets the variables when non-empty.
 
  -- Josselin Mouette <joss at debian.org>  Thu, 02 Jun 2011 12:43:17 +0200
 

Modified: desktop/experimental/gdm3/debian/patches/01_language.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/01_language.patch?rev=28444&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/01_language.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/01_language.patch [utf-8] Tue Jun 14 22:30:47 2011
@@ -1,16 +1,50 @@
-GNOME #649413
+From 1a37cd929bcc2c387c23cee1cdcfffd6d9863116 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Mon, 13 Jun 2011 20:32:18 -0400
+Subject: [PATCH] daemon: don't set LANG to empty value
 
-Index: gdm-3.0.0/daemon/gdm-session-direct.c
-===================================================================
---- gdm-3.0.0.orig/daemon/gdm-session-direct.c	2011-04-29 01:19:33.240497348 +0200
-+++ gdm-3.0.0/daemon/gdm-session-direct.c	2011-04-29 01:19:39.568528281 +0200
-@@ -1970,9 +1970,6 @@ setup_session_environment (GdmSessionDir
+This makes PAM not set it to a proper value later.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=649413
+---
+ daemon/gdm-session-direct.c |   18 ++++++++++++------
+ 1 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
+index fa8ae49..e977486 100644
+--- a/daemon/gdm-session-direct.c
++++ b/daemon/gdm-session-direct.c
+@@ -2211,6 +2211,8 @@ gdm_session_direct_set_environment_variable (GdmSessionDirect *session,
+ static void
+ setup_session_environment (GdmSessionDirect *session)
+ {
++        const char *locale;
++
+         gdm_session_direct_set_environment_variable (session,
+                                                      "GDMSESSION",
+                                                      get_session_name (session));
+@@ -2218,12 +2220,16 @@ setup_session_environment (GdmSessionDirect *session)
+                                                      "DESKTOP_SESSION",
                                                       get_session_name (session));
  
-         gdm_session_direct_set_environment_variable (session,
+-        gdm_session_direct_set_environment_variable (session,
 -                                                     "LANG",
 -                                                     get_language_name (session));
 -        gdm_session_direct_set_environment_variable (session,
-                                                      "GDM_LANG",
-                                                      get_language_name (session));
+-                                                     "GDM_LANG",
+-                                                     get_language_name (session));
++        locale = get_language_name (session);
++
++        if (locale != NULL && locale[0] != '\0') {
++                gdm_session_direct_set_environment_variable (session,
++                                                             "LANG",
++                                                             locale);
++                gdm_session_direct_set_environment_variable (session,
++                                                             "GDM_LANG",
++                                                             locale);
++        }
  
+         gdm_session_direct_set_environment_variable (session,
+                                                      "DISPLAY",
+-- 
+1.7.5.1