From b681969f9094480a1f1092d4dbe1e2c5c336b63f Mon Sep 17 00:00:00 2001 From: Lionel Le Folgoc Date: Thu, 24 Mar 2011 20:01:04 +0100 Subject: Drop GDM compatibility code otherwise the session locale might be set to an invalid value. $GDM_LANG doesn't always contain a full valid locale. It might contain a "short" one (e.g. "fr") that is expanded (e.g. to "fr_fr.UTF-8) by an Xsession script shipped by gdm. So drop the compatibility code from xfce4-session, otherwise the session locale might be set to an invalid value. Closes bug: #15414 --- xfce4-session/main.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'xfce4-session') diff --git a/xfce4-session/main.c b/xfce4-session/main.c index 4881c62b..9dc9194d 100644 --- a/xfce4-session/main.c +++ b/xfce4-session/main.c @@ -108,14 +108,6 @@ setup_environment (void) /* pass correct DISPLAY to children, in case of --display in argv */ g_setenv ("DISPLAY", gdk_display_get_name (gdk_display_get_default ()), TRUE); - /* this is for compatibility with the GNOME Display Manager */ - lang = g_getenv ("GDM_LANG"); - if (lang != NULL && strlen (lang) > 0) - { - g_setenv ("LANG", lang, TRUE); - g_unsetenv ("GDM_LANG"); - } - /* check access to $ICEAUTHORITY or $HOME/.ICEauthority if unset */ if (g_getenv ("ICEAUTHORITY")) authfile = g_strdup (g_getenv ("ICEAUTHORITY")); -- cgit v1.2.1