diff options
| author | George Lebl <jirka@5z.com> | 2002-08-07 21:02:10 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2002-08-07 21:02:10 +0000 |
| commit | d6d92a4e00886ac5e6c5661bd9657068888e728a (patch) | |
| tree | 407361fcdb24c5a29233e87c6075b3ad13a50d37 /daemon | |
| parent | 529c4d69585b7915bcb09347f5c5b9db2a0a529e (diff) | |
| download | gdm-d6d92a4e00886ac5e6c5661bd9657068888e728a.tar.gz | |
overwrite gnomerc and create .orig as with the other scripts
Wed Aug 07 14:10:57 2002 George Lebl <jirka@5z.com>
* config/Makefile.am: overwrite gnomerc and create .orig as with the
other scripts
* daemon/slave.c: don't set GDM_LANG unless the user actually
selected something. This should make things nicer on system
langauge sensing things.
* config/Gnome.in, config/Xsession.in: normalize langauge stuff in
case the user selected a language. whack LC_ALL, LANGUAGE and
LINGUAS if they differ from GDM_LANG if this was set (if not
using 'System default' language setting). Should fix #89970
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/slave.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/daemon/slave.c b/daemon/slave.c index 53fd7887..1b0e35f7 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -2221,12 +2221,6 @@ session_child_run (struct passwd *pwent, if ( ! def_language) { gnome_setenv ("LANG", language, TRUE); gnome_setenv ("GDM_LANG", language, TRUE); - } else { - if (g_getenv ("LANG") == NULL) - gnome_unsetenv ("GDM_LANG"); - else - /* setusercontext sets up user languages */ - gnome_setenv ("GDM_LANG", g_getenv ("LANG"), TRUE); } #else if (setuid (pwent->pw_uid) < 0) @@ -2235,7 +2229,11 @@ session_child_run (struct passwd *pwent, /* Set locale */ gnome_setenv ("LANG", language, TRUE); - gnome_setenv ("GDM_LANG", language, TRUE); + /* Only force GDM_LANG to something if there is other then + * default selected. Else let the session do whatever it + * does since we're using sys default */ + if ( ! def_language) + gnome_setenv ("GDM_LANG", language, TRUE); #endif chdir (home_dir); |