Commit b681969f authored by Lionel Le Folgoc's avatar Lionel Le Folgoc Committed by Unit 193
Browse files

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
parent 83472155
......@@ -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"));
......
  • main.c: In function ‘setup_environment’:
    main.c:91:16: warning: unused variable ‘lang’ [-Wunused-variable]
       91 |   const gchar *lang;
          |                ^~~~
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment