Merged trunk and added symbols

diff --cc common/user-list.c
index 3b8d5a15e62b26d2edebb4cdf8b2b3206db4ed76,3b8d5a15e62b26d2edebb4cdf8b2b3206db4ed76..618c786348bc12f1762ba192a3213ac4b8612627
--- 1/common/user-list.c
--- 2/common/user-list.c
+++ b/common/user-list.c
@@@ -1219,6 -1219,6 +1219,12 @@@ 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 --cc debian/liblightdm-gobject-1-0.symbols
index 8baa6ca5ec0e48580dd2eafc4e951ffde2e3430d,8baa6ca5ec0e48580dd2eafc4e951ffde2e3430d..acba111351f63fe704b1353c214d3c32986f83d0
--- 1/debian/liblightdm-gobject-1-0.symbols
--- 2/debian/liblightdm-gobject-1-0.symbols
+++ b/debian/liblightdm-gobject-1-0.symbols
@@@ -78,6 -78,6 +78,7 @@@ liblightdm-gobject-1.so.0 liblightdm-go
   lightdm_user_get_real_name@Base 0.9.2
   lightdm_user_get_session@Base 0.9.2
   lightdm_user_get_type@Base 0.9.2
++ lightdm_user_get_uid@Base 1.11.1-0ubuntu1
   lightdm_user_list_get_instance@Base 0.9.2
   lightdm_user_list_get_length@Base 0.9.2
   lightdm_user_list_get_type@Base 0.9.2

diff --cc liblightdm-gobject/language.c
index 4dce374a7fb26442e6ccb86542808ef97d8731e1,4dce374a7fb26442e6ccb86542808ef97d8731e1..9f4c183c5845e221ef0f22e351081acb4a06cf3f
--- 1/liblightdm-gobject/language.c
--- 2/liblightdm-gobject/language.c
+++ b/liblightdm-gobject/language.c
@@@ -40,7 -40,7 +40,7 @@@ static GList *languages = NULL
  static void
  update_languages (void)
  {
--    gchar *command = "locale -a";
++    gchar *command = "/usr/share/language-tools/language-options";
      gchar *stdout_text = NULL, *stderr_text = NULL;
      gint exit_status;
      gboolean result;
@@@ -161,15 -161,15 +161,39 @@@ 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, lang))
++        if (lightdm_language_matches (language, short_lang))
              return language;
      }
  

diff --cc po/POTFILES.in
index 2668b565d521ba358f273b08f8cdde23e1109842,2668b565d521ba358f273b08f8cdde23e1109842..e9e99699315e71e8f28c9ffebb0a7002d49e6f6b
--- 1/po/POTFILES.in
--- 2/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -1,5 -1,5 +1,6 @@@
  # 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 --cc src/seat.c
index b10bdeb8bb8ab7ed08835a82e8c19a50d27a8cff,b10bdeb8bb8ab7ed08835a82e8c19a50d27a8cff..eed8a92a0b837bab83dc5ee7b639a26af6d389d2
--- 1/src/seat.c
--- 2/src/seat.c
+++ b/src/seat.c
@@@ -955,7 -955,7 +955,7 @@@ configure_session (Session *session, Se
          session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
      if (language && language[0] != '\0')
      {
--        session_set_env (session, "LANG", language);
++        session_set_env (session, "LANGUAGE", language);
          session_set_env (session, "GDM_LANG", language);
      }
  }

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