r13480 - in /desktop/unstable/gdm/debian: changelog patches/67_dont_use_LC_CTYPE_for_GDMLANG.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Nov 18 15:50:56 2007
New Revision: 13480

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13480
Log:
* debian/patches/67_dont_use_LC_CTYPE_for_GDMLANG.patch:
  + Added. Use g_get_language_names to determine the value of GDM_LANG
    instead of LC_CTYPE

Added:
    desktop/unstable/gdm/debian/patches/67_dont_use_LC_CTYPE_for_GDMLANG.patch
Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/patches/series

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=13480&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Sun Nov 18 15:50:56 2007
@@ -1,3 +1,11 @@
+gdm (2.20.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/67_dont_use_LC_CTYPE_for_GDMLANG.patch:
+    + Added. Use g_get_language_names to determine the value of GDM_LANG
+      instead of LC_CTYPE
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 18 Nov 2007 16:49:11 +0100
+
 gdm (2.20.1-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Added: desktop/unstable/gdm/debian/patches/67_dont_use_LC_CTYPE_for_GDMLANG.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/67_dont_use_LC_CTYPE_for_GDMLANG.patch?rev=13480&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/67_dont_use_LC_CTYPE_for_GDMLANG.patch (added)
+++ desktop/unstable/gdm/debian/patches/67_dont_use_LC_CTYPE_for_GDMLANG.patch Sun Nov 18 15:50:56 2007
@@ -1,0 +1,28 @@
+Index: gdm-2.20.1/daemon/gdm.c
+===================================================================
+--- gdm-2.20.1.orig/daemon/gdm.c	2007-11-18 16:39:51.000000000 +0100
++++ gdm-2.20.1/daemon/gdm.c	2007-11-18 16:39:59.000000000 +0100
+@@ -1585,9 +1585,7 @@
+ 
+ 	main_loop = g_main_loop_new (NULL, FALSE);
+ 
+-	if (setlocale (LC_CTYPE, NULL) != NULL) {
+-		gdm_system_locale = g_strdup (setlocale (LC_CTYPE, NULL));
+-	}
++	gdm_system_locale = g_strdup (g_get_language_names()[0]);
+ 	/* initial TERM/INT handler */
+ 	sig.sa_handler = initial_term_int;
+ 	sig.sa_flags = SA_RESTART;
+Index: gdm-2.20.1/daemon/slave.c
+===================================================================
+--- gdm-2.20.1.orig/daemon/slave.c	2007-11-18 16:39:51.000000000 +0100
++++ gdm-2.20.1/daemon/slave.c	2007-11-18 16:39:59.000000000 +0100
+@@ -5576,7 +5576,7 @@
+ 				const char *gdm_system_locale;
+ 
+ 				locale = (gchar*)(msg + 3);
+-				gdm_system_locale = setlocale (LC_CTYPE, NULL);
++				gdm_system_locale = g_get_language_names()[0];
+ 
+ 				always_restart_greeter = (gboolean)(*(msg + 2));
+ 				ve_clearenv ();

Modified: desktop/unstable/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/series?rev=13480&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/series (original)
+++ desktop/unstable/gdm/debian/patches/series Sun Nov 18 15:50:56 2007
@@ -11,4 +11,5 @@
 56_xnest-wrapper.patch
 62_reference-manual-docbook-entity-reference.patch
 #66_socket-in-var-run-for-fhs.patch
+67_dont_use_LC_CTYPE_for_GDMLANG.patch
 70_mandatory-relibtoolize.patch