allow asking for list of configured layouts for a given user

2 files changed, 33 insertions, 15 deletions

diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index 982f15b5..cb22e00d 100644
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -113,6 +113,23 @@ request_cb (const gchar *request)
     }
     g_free (r);
 
+    r = g_strdup_printf ("GREETER %s LOG-LAYOUTS USERNAME=", getenv ("DISPLAY"));
+    if (g_str_has_prefix (request, r))
+    {
+        LightDMUser *user;
+        const gchar *username;
+        const gchar * const *layouts;
+        int i;
+
+        username = request + strlen (r);
+        user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username);
+        layouts = lightdm_user_get_layouts (user);
+
+        for (i = 0; layouts[i]; i++)
+            status_notify ("GREETER %s LOG-LAYOUTS USERNAME=%s LAYOUT='%s'", getenv ("DISPLAY"), username, layouts[i]);
+    }
+    g_free (r);
+
     r = g_strdup_printf ("GREETER %s LOG-VARIANTS LAYOUT=", getenv ("DISPLAY"));
     if (g_str_has_prefix (request, r))
     {
diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c
index f5f550eb..c08e3954 100644
--- a/tests/src/test-runner.c
+++ b/tests/src/test-runner.c
@@ -49,7 +49,7 @@ typedef struct
     guint id;
     gchar *language;
     gchar *xsession;
-    gchar *layout;
+    gchar **layouts;
 } AccountsUser;
 static GList *accounts_users = NULL;
 static void handle_user_call (GDBusConnection       *connection,
@@ -788,7 +788,7 @@ load_passwd_file ()
                     *c = '\0';
             }
             user->xsession = g_key_file_get_string (dmrc_file, "Desktop", "Session", NULL);
-            user->layout = g_key_file_get_string (dmrc_file, "X-Accounts", "Layout", NULL);
+            user->layouts = g_key_file_get_string_list (dmrc_file, "X-Accounts", "Layouts", NULL, NULL);
             user->path = g_strdup_printf ("/org/freedesktop/Accounts/User%d", uid);
             user->id = g_dbus_connection_register_object (accounts_connection,
                                                           user->path,
@@ -913,8 +913,9 @@ handle_user_get_property (GDBusConnection       *connection,
         return g_variant_new_string (user->language ? user->language : "");
     else if (strcmp (property_name, "XSession") == 0)
         return g_variant_new_string (user->xsession ? user->xsession : "");
-    else if (strcmp (property_name, "XKeyboardLayout") == 0)
-        return g_variant_new_string (user->layout ? user->layout : "");
+    else if (strcmp (property_name, "XKeyboardLayouts") == 0 &&
+             user->layouts != NULL && user->layouts[0] != NULL)
+        return g_variant_new_strv ((const gchar * const *) user->layouts, -1);
 
     return NULL;
 }
@@ -952,7 +953,7 @@ accounts_name_acquired_cb (GDBusConnection *connection,
         "    <property name='BackgroundFile' type='s' access='read'/>"
         "    <property name='Language' type='s' access='read'/>"
         "    <property name='XSession' type='s' access='read'/>"
-        "    <property name='XKeyboardLayout' type='s' access='read'/>"
+        "    <property name='XKeyboardLayouts' type='as' access='read'/>"
         "  </interface>"
         "</node>";
     GError *error = NULL;
@@ -1205,18 +1206,18 @@ main (int argc, char **argv)
         gchar *real_name;
         gchar *xsession;
         gchar *dmrc_layout;
-        gchar *dbus_layout;
+        gchar *dbus_layouts;
         gchar *language;
         gint uid;
     } users[] =
     {
-        {"root",    "",         TRUE,  "root",       NULL,          NULL, NULL,      NULL,             0},
-        {"lightdm", "",         TRUE,  "",           NULL,          NULL, NULL,      NULL,           100},
-        {"alice",   "password", TRUE,  "Alice User", NULL,          NULL, NULL,      NULL,          1000},
-        {"bob",     "",         TRUE,  "Bob User",   NULL,          "us", NULL,      "en_AU.utf8",  1001},
-        {"carol",   "",         TRUE,  "Carol User", "alternative", "ru", "fr\toss", "fr_FR.UTF-8", 1002},
-        {"dave",    "",         FALSE, "Dave User",  NULL,          NULL, NULL,      NULL,          1003},
-        {NULL,      NULL,       FALSE, NULL,         NULL,          NULL, NULL,      NULL,             0}
+        {"root",    "",         TRUE,  "root",       NULL,          NULL, NULL,          NULL,             0},
+        {"lightdm", "",         TRUE,  "",           NULL,          NULL, NULL,          NULL,           100},
+        {"alice",   "password", TRUE,  "Alice User", NULL,          NULL, NULL,          NULL,          1000},
+        {"bob",     "",         TRUE,  "Bob User",   NULL,          "us", NULL,          "en_AU.utf8",  1001},
+        {"carol",   "",         TRUE,  "Carol User", "alternative", "ru", "fr\toss;ru;", "fr_FR.UTF-8", 1002},
+        {"dave",    "",         FALSE, "Dave User",  NULL,          NULL, NULL,          NULL,          1003},
+        {NULL,      NULL,       FALSE, NULL,         NULL,          NULL, NULL,          NULL,             0}
     };
     passwd_data = g_string_new ("");
     int i;
@@ -1245,9 +1246,9 @@ main (int argc, char **argv)
             g_key_file_set_string (dmrc_file, "Desktop", "Layout", users[i].dmrc_layout);
             save_dmrc = TRUE;
         }
-        if (users[i].dbus_layout)
+        if (users[i].dbus_layouts)
         {
-            g_key_file_set_string (dmrc_file, "X-Accounts", "Layout", users[i].dbus_layout);
+            g_key_file_set_string (dmrc_file, "X-Accounts", "Layouts", users[i].dbus_layouts);
             save_dmrc = TRUE;
         }
         if (users[i].language)