Merge lp:~gber/lightdm/lightdm-language-selection into lp:lightdm

[Guido Berhoerster]

Fix the two bugs which prevent the language selection from working

[Robert Ancell (robert-ancell)]

What is the #if 0 code doing there? No dead code please.

review: Needs Fixing

[lp:~gber/lightdm/lightdm-language-selection]

1647. By Guido Berhoerster on 2013-04-19

Remove dead code and clarify comment

[Guido Berhoerster (gber)]

> What is the #if 0 code doing there? No dead code please.

Removed and clarified comment.

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'liblightdm-gobject/user.c'
--- liblightdm-gobject/user.c	2013-01-31 20:56:09 +0000
+++ liblightdm-gobject/user.c	2013-04-19 09:45:32 +0000
@@ -1132,16 +1132,10 @@
 
     // FIXME: Watch for changes
 
-    /* The Language field is actually a locale, strip the codeset off it to get the language */
+    /* The Language field contains the locale */
     if (priv->language)
         g_free (priv->language);
     priv->language = g_key_file_get_string (priv->dmrc_file, "Desktop", "Language", NULL);
-    if (priv->language)
-    {
-        gchar *codeset = strchr (priv->language, '.');
-        if (codeset)
-            *codeset = '\0';
-    }
 
     if (priv->layouts)
     {
 
=== modified file 'src/accounts.c'
--- src/accounts.c	2012-01-13 13:05:33 +0000
+++ src/accounts.c	2013-04-19 09:45:32 +0000
@@ -44,9 +44,6 @@
     /* Language */
     gchar *language;
 
-    /* Locale */
-    gchar *locale;
-
     /* X session */
     gchar *xsession;
 };
@@ -332,36 +329,52 @@
     return user->priv->shell;
 }
 
-const gchar *
-user_get_locale (User *user)
-{
-    g_return_val_if_fail (user != NULL, NULL);
-
-    g_free (user->priv->locale);
-    if (user->priv->proxy)
-        user->priv->locale = NULL;
-    else
-        user->priv->locale = get_string_from_dmrc (user->priv->name, "Desktop", "Language");
-
-    /* Treat a blank locale as unset */
-    if (g_strcmp0 (user->priv->locale, "") == 0)
-    {
-        g_free (user->priv->locale);
-        user->priv->locale = NULL;
-    }
-
-    return user->priv->locale;
-}
-
 void
 user_set_language (User *user, const gchar *language)
 {
     g_return_if_fail (user != NULL);
 
+    call_method (user->priv->proxy, "SetLanguage", g_variant_new ("(s)", language), "()", NULL);
+    save_string_to_dmrc (user->priv->name, "Desktop", "Language", language);
+}
+
+const gchar *
+user_get_language (User *user)
+{
+    GVariant *variant, *inner;
+    gboolean success;
+
+    g_return_val_if_fail (user != NULL, NULL);
+
+    g_free (user->priv->language);
     if (user->priv->proxy)
-        call_method (user->priv->proxy, "SetLanguage", g_variant_new ("(s)", language), "()", NULL);
+    {
+        /* the "Language" property cannot be retrieved with get_property () here since it
+         * uses g_dbus_proxy_get_cached_property () which would return the previous (cached) value
+         * of the "Language" property
+         */
+        success = call_method (user->priv->proxy, "org.freedesktop.DBus.Properties.Get", g_variant_new ("(ss)", g_dbus_proxy_get_interface_name(user->priv->proxy), "Language"), "(v)", &variant);
+        if (success)
+        {
+            g_variant_get (variant, "(v)", &inner);
+            user->priv->language = g_variant_dup_string (inner, NULL);
+            g_variant_unref (inner);
+            g_variant_unref (variant);
+        }
+        else
+            user->priv->language = NULL;
+    }
     else
-        save_string_to_dmrc (user->priv->name, "Desktop", "Language", language);
+        user->priv->language = get_string_from_dmrc (user->priv->name, "Desktop", "Language");
+
+    /* Treat a blank language as unset */
+    if (g_strcmp0 (user->priv->language, "") == 0)
+    {
+        g_free (user->priv->language);
+        user->priv->language = NULL;
+    }
+
+    return user->priv->language;
 }
 
 void
@@ -436,6 +449,7 @@
     g_free (self->priv->gecos);
     g_free (self->priv->home_directory);
     g_free (self->priv->shell);
+    g_free (self->priv->language);
 
     G_OBJECT_CLASS (user_parent_class)->finalize (object);  
 }
 
=== modified file 'src/accounts.h'
--- src/accounts.h	2011-11-29 04:42:03 +0000
+++ src/accounts.h	2013-04-19 09:45:32 +0000
@@ -58,7 +58,7 @@
 
 void user_set_xsession (User *user, const gchar *session);
 
-const gchar *user_get_locale (User *user);
+const gchar *user_get_language (User *user);
 
 void user_set_language (User *user, const gchar *language);
 
 
=== modified file 'src/display.c'
--- src/display.c	2013-03-26 22:22:49 +0000
+++ src/display.c	2013-04-19 09:45:32 +0000
@@ -702,6 +702,7 @@
 {
     User *user;
     gchar *filename, *sessions_dir, *path;
+    const gchar *language;
     gchar **argv;
 
     user = session_get_user (display->priv->session);
@@ -725,6 +726,14 @@
     if (!argv)
         return TRUE;
   
+    /* Retrieve language setting */
+    language = user_get_language (user);
+    if (language != NULL && language != '\0')
+    {
+        session_set_env (display->priv->session, "LANG", language);
+        session_set_env (display->priv->session, "GDM_LANG", language);
+    }
+
     session_set_env (display->priv->session, "DESKTOP_SESSION", display->priv->user_session); // FIXME: Apparently deprecated?
     session_set_env (display->priv->session, "GDMSESSION", display->priv->user_session); // FIXME: Not cross-desktop