Remove unwanted mod

diff --git a/common/user-list.c b/common/user-list.c
index 618c786348bc12f1762ba192a3213ac4b8612627..3b8d5a15e62b26d2edebb4cdf8b2b3206db4ed76 100644 (file)
--- a/common/user-list.c
+++ b/common/user-list.c
@@ -1219,12 +1219,6 @@ load_user_values (CommonUser *user)
 
     if (!priv->path)
         load_dmrc (user);
-
-    if (g_strcmp0 (priv->session, "ubuntu-2d") == 0)
-    {
-        g_free(priv->session);
-        priv->session = g_strdup ("ubuntu");
-    }
 }
 
 /**

diff --git a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c
index 9f4c183c5845e221ef0f22e351081acb4a06cf3f..4dce374a7fb26442e6ccb86542808ef97d8731e1 100644 (file)
--- a/liblightdm-gobject/language.c
+++ b/liblightdm-gobject/language.c
@@ -40,7 +40,7 @@ static GList *languages = NULL;
 static void
 update_languages (void)
 {
-    gchar *command = "/usr/share/language-tools/language-options";
+    gchar *command = "locale -a";
     gchar *stdout_text = NULL, *stderr_text = NULL;
     gint exit_status;
     gboolean result;
@@ -161,39 +161,15 @@ lightdm_get_language (void)
 {
     const gchar *lang;
     GList *link;
-    static const gchar *short_lang = NULL;
-
-    if (short_lang)
-        goto match;
 
     lang = g_getenv ("LANG");
     if (!lang)
         return NULL;
 
-    /* Convert to a short form language code */
-    gchar *command = g_strconcat ("/usr/share/language-tools/language-validate ", lang, NULL);
-    gchar *out;
-    GError *error = NULL;
-    if (g_spawn_command_line_sync (command, &out, NULL, NULL, &error))
-    {
-        short_lang = g_strdup (g_strchomp (out));
-        g_free (out);
-        g_free (command);
-    }
-    else
-    {
-        g_warning ("Failed to run '%s': %s", command, error->message);
-        g_error_free (error);
-        g_free (command);
-        return NULL;
-    }
-
-match:
-
     for (link = lightdm_get_languages (); link; link = link->next)
     {
         LightDMLanguage *language = link->data;
-        if (lightdm_language_matches (language, short_lang))
+        if (lightdm_language_matches (language, lang))
             return language;
     }
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e9e99699315e71e8f28c9ffebb0a7002d49e6f6b..2668b565d521ba358f273b08f8cdde23e1109842 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-debian/guest-session-auto.sh
 src/lightdm.c
 src/dm-tool.c

diff --git a/src/seat.c b/src/seat.c
index eed8a92a0b837bab83dc5ee7b639a26af6d389d2..b10bdeb8bb8ab7ed08835a82e8c19a50d27a8cff 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -955,7 +955,7 @@ configure_session (Session *session, SessionConfig *config, const gchar *session
         session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
     if (language && language[0] != '\0')
     {
-        session_set_env (session, "LANGUAGE", language);
+        session_set_env (session, "LANG", language);
         session_set_env (session, "GDM_LANG", language);
     }
 }

diff --git a/tests/scripts/language-env.conf b/tests/scripts/language-env.conf
index 7963d565b715abf7b23ac238988680bd8a168152..2f18924fcec17ec312cf6ae1a54187b3d8a321b8 100644 (file)
--- a/tests/scripts/language-env.conf
+++ b/tests/scripts/language-env.conf
@@ -24,8 +24,8 @@ user-session=default
 #?SESSION-X-0 CONNECT-XSERVER
 
 # Check environment variables
-#?*SESSION-X-0 READ-ENV NAME=LANGUAGE
-#?SESSION-X-0 READ-ENV NAME=LANGUAGE VALUE=en_AU
+#?*SESSION-X-0 READ-ENV NAME=LANG
+#?SESSION-X-0 READ-ENV NAME=LANG VALUE=en_AU
 #?*SESSION-X-0 READ-ENV NAME=GDM_LANG
 #?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU