r13070 - in /desktop/unstable/gnome-session/debian: changelog patches/01_ignore-gdm-lang.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Oct 11 20:44:06 2007
New Revision: 13070

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13070
Log:
* 01_ignore-gdm-lang.patch: ignore GDM_LANG. This only serves the
  purpose to break anything that modifies locale settings.
  Closes: #445646.

Added:
    desktop/unstable/gnome-session/debian/patches/01_ignore-gdm-lang.patch
Modified:
    desktop/unstable/gnome-session/debian/changelog

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=13070&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Thu Oct 11 20:44:06 2007
@@ -1,9 +1,12 @@
-gnome-session (2.20.0-2) UNRELEASED; urgency=low
+gnome-session (2.20.0-2) unstable; urgency=low
 
   * Conflict with bug-buddy << 2.20 for breakpad support.
     Closes: #443638.
-
- -- Josselin Mouette <joss at debian.org>  Sat, 22 Sep 2007 16:17:40 +0200
+  * 01_ignore-gdm-lang.patch: ignore GDM_LANG. This only serves the
+    purpose to break anything that modifies locale settings.
+    Closes: #445646.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 11 Oct 2007 22:35:32 +0200
 
 gnome-session (2.20.0-1) unstable; urgency=low
 

Added: desktop/unstable/gnome-session/debian/patches/01_ignore-gdm-lang.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/01_ignore-gdm-lang.patch?rev=13070&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/01_ignore-gdm-lang.patch (added)
+++ desktop/unstable/gnome-session/debian/patches/01_ignore-gdm-lang.patch Thu Oct 11 20:44:06 2007
@@ -1,0 +1,43 @@
+--- gnome-session/main.c.orig	2007-10-11 22:30:49.791406486 +0200
++++ gnome-session/main.c	2007-10-11 22:32:51.678352427 +0200
+@@ -111,32 +111,6 @@
+   sigaction (sig, &act, NULL);
+ }
+ 
+-/* Set language environment variables based on what GDM is setting
+- */
+-static void
+-set_lang (void)
+-{
+-  const char *gdm_lang;
+-  char       *short_lang;
+-  char       *p;
+-
+-  gdm_lang = g_getenv("GDM_LANG");
+-  if (gdm_lang)
+-    {
+-      short_lang = g_strdup (gdm_lang);
+-      p = strchr(short_lang, '_');
+-      if (p)
+-	*p = '\0';
+-
+-      g_setenv ("LANG", gdm_lang, TRUE);
+-
+-      /* g_setenv ("LANGUAGE", short_lang, TRUE); */
+-      /* g_setenv ("LC_ALL", gdm_lang, TRUE); */
+-
+-      g_free (short_lang);
+-    }
+-}
+-
+ /* Point GTK_RC_FILES at a separate file that we change in
+  * in gnome-settings-daemon.
+  */
+@@ -632,7 +606,6 @@
+     }
+   g_strfreev (versions);
+       
+-  set_lang();
+   set_gtk1_theme_rcfile ();
+ 
+   /* Initialize the i18n stuff */