| 1 |
From 8df85ee654dd951b47e1362fe32ceb3acc84fccc Mon Sep 17 00:00:00 2001 |
| 2 |
From: Colin Guthrie <colin@mageia.org> |
| 3 |
Date: Wed, 22 Jan 2014 01:03:22 +0000 |
| 4 |
Subject: [PATCH] Kill off GDM_LANG mga#12328 |
| 5 |
|
| 6 |
This is a cut down version of upstream commit: |
| 7 |
https://git.gnome.org/browse/gdm/commit/?id=0b2d22f63b3e6b3185d4e9a93bb192a21a695f9e |
| 8 |
--- |
| 9 |
daemon/gdm-session.c | 3 --- |
| 10 |
data/Xsession.in | 7 ------- |
| 11 |
2 files changed, 10 deletions(-) |
| 12 |
|
| 13 |
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c |
| 14 |
index b2d931d..900d5f5 100644 |
| 15 |
--- a/daemon/gdm-session.c |
| 16 |
+++ b/daemon/gdm-session.c |
| 17 |
@@ -2284,9 +2284,6 @@ setup_session_environment (GdmSession *self) |
| 18 |
gdm_session_set_environment_variable (self, |
| 19 |
"LANG", |
| 20 |
locale); |
| 21 |
- gdm_session_set_environment_variable (self, |
| 22 |
- "GDM_LANG", |
| 23 |
- locale); |
| 24 |
} |
| 25 |
|
| 26 |
gdm_session_set_environment_variable (self, |
| 27 |
diff --git a/data/Xsession.in b/data/Xsession.in |
| 28 |
index 118518c..f253375 100755 |
| 29 |
--- a/data/Xsession.in |
| 30 |
+++ b/data/Xsession.in |
| 31 |
@@ -146,13 +146,6 @@ fi |
| 32 |
|
| 33 |
unset XKB_IN_USE |
| 34 |
|
| 35 |
-# Overwrite $LANG from /etc/profile (and friends) with the one picked in the |
| 36 |
-# greeter |
| 37 |
-if [ -n "$GDM_LANG" ]; then |
| 38 |
- LANG="$GDM_LANG" |
| 39 |
- export LANG |
| 40 |
-fi |
| 41 |
- |
| 42 |
xhost +si:localuser:`id -un` || : |
| 43 |
|
| 44 |
# run all system xinitrc shell scripts. |
| 45 |
-- |
| 46 |
1.8.4.5 |
| 47 |
|
Parent Directory
| 
Revision Log