Merge lp:~mterry/lightdm/refactor-accounts into lp:lightdm

[Michael Terry]

Refactor LightDMUser and User classes to use the same code internally

I was starting work on the shared user data directories feature (bug 1263418), when I realized I needed to do a bit of refactoring. I wanted to add knowledge to the lightdm daemon of the list of users on the system and to pay attention to user adds and removals.

But there was already a bit of overlap between liblightdm-gobject/user.c and src/accounts.c. Adding the above user-list info to src/accounts.c would make them so similar that it would be criminal to not try to consolidate them a bit.

So I've added a common/ directory with a static libcommon.a, used by liblightdm-gobject and the lightdm daemon. I realize "common" is a dumb name. But since LightDMUser and User were already claimed by other internal objects, I didn't feel like being overly clever with the naming. So CommonUser it was. I will change the namespace to whatever you like.

I've switched LightDMUser and User to internally use CommonUser without changing their own APIs. That was necessary for LightDMUser and a matter of convenience for User. A few small classes have moved from src/ to common/ to support CommonUser (I didn't bother Common-namespacing those small classes since they didn't conflict with other code).

Moving the Configuration class into common/ let me re-use it in liblightdm-gobject, where the same job was being done manually (not much of a savings in my branch right now, but that section of code should be changed to look in lightdm.conf.d as well as just lightdm.conf, and using Configuration will make that future FIXME much easier to solve).

This branch means that the lightdm daemon relies on AccountsService a bit more than it used to (its previous primary lookup for user info was passwd, whereas this branch now prefers AS with a fallback to passwd). So I had to build out a few pieces of the test framework to emulate AS a bit better.

This branch may be overkill to land before my shared data branch (as it means the lightdm daemon is monitoring the user list needlessly). But it doesn't hurt to start reviewing it. I've also changed the Session monitoring to be started lazily; only if the API consumer asks whether a user is logged in do we start monitoring (i.e. the lightdm daemon won't be monitoring Sessions needlessly).

[lp:~mterry/lightdm/refactor-accounts]

1879. By Michael Terry on 2014-02-07

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1878
http://jenkins.qa.ubuntu.com/job/lightdm-ci/234/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/28/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/234/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1879
http://jenkins.qa.ubuntu.com/job/lightdm-ci/235/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/235/rebuild

review: Needs Fixing (continuous-integration)

[Robert Ancell (robert-ancell)]

Looks good.

The amount of shared code regarding users has been something that has felt inefficient so this approach seems good.
I've also had a slight concern that the daemon relying too heavily on accounts service might be a reliability issue, but I guess we just need to see how that goes. Also wondering how much accounts service would lean towards reporting "real" user accounts and not the system accounts we require.

Obviously the patch is enormous, but is mostly just moving / renaming so I'll rely heavily on the regression tests picking out any mistakes.

Also worth considering is if LightDM moves early into the boot when A-S is not available / not applicable what the daemon should do (switch passwd to a-s part after start? Restart from light to full mode?). This can be tackled if/when we cross that bridge though.

I'm not sure

I'll review more closely when I get back from travelling.

[Michael Terry (mterry)]

Regarding your concern about AS not reporting the system users we need... the current daemon code actually only ever calls common_user_list_get_user_by_name(), to which I've added the fallback to look up system users.

So common_user_list_get_users() returns a list of "normal" users. But if you ask for a specific user using by_name() (as the daemon has need to every now and then), it will first look in that normal list but if it can't find it, grab a system user from passwd.

[lp:~mterry/lightdm/refactor-accounts]

1880. By Michael Terry on 2014-02-08

Add better cleanup as lightdm daemon closes

1881. By Michael Terry on 2014-02-08

Update patches

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1881
http://jenkins.qa.ubuntu.com/job/lightdm-ci/236/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/236/rebuild

review: Approve (continuous-integration)

[lp:~mterry/lightdm/refactor-accounts]

1882. By Michael Terry on 2014-02-08

Add shared data manager and test

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-11-07 07:54:55 +0000
+++ Makefile.am	2014-02-08 22:36:44 +0000
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS = common
 if COMPILE_LIBLIGHTDM_GOBJECT
 SUBDIRS += liblightdm-gobject
 endif

=== added directory 'common'
=== added file 'common/Makefile.am'
--- common/Makefile.am	1970-01-01 00:00:00 +0000
+++ common/Makefile.am	2014-02-08 22:36:44 +0000
@@ -0,0 +1,23 @@
+# -*- Mode: Automake; indent-tabs-mode: t; tab-width: 4 -*-
+
+noinst_LTLIBRARIES = libcommon.la
+
+libcommon_la_SOURCES = \
+	configuration.c \
+	configuration.h \
+	dmrc.c \
+	dmrc.h \
+	privileges.c \
+	privileges.h \
+	user-list.c \
+	user-list.h
+
+libcommon_la_CFLAGS = \
+	$(WARN_CFLAGS) \
+	$(GLIB_CFLAGS)
+
+libcommon_la_LIBADD = \
+	$(GLIB_LDFLAGS)
+
+DISTCLEANFILES = \
+	Makefile.in

=== renamed file 'src/configuration.c' => 'common/configuration.c'
=== renamed file 'src/configuration.h' => 'common/configuration.h'
=== renamed file 'src/dmrc.c' => 'common/dmrc.c'
--- src/dmrc.c	2013-06-13 03:17:43 +0000
+++ common/dmrc.c	2014-02-08 22:36:44 +0000
@@ -15,34 +15,26 @@
 
 #include "dmrc.h"
 #include "configuration.h"
-#include "accounts.h"
 #include "privileges.h"
+#include "user-list.h"
 
 GKeyFile *
-dmrc_load (const gchar *username)
+dmrc_load (CommonUser *user)
 {
-    User *user;
     GKeyFile *dmrc_file;
     gchar *path;
     gboolean have_dmrc, drop_privileges;
 
     dmrc_file = g_key_file_new ();
 
-    user = accounts_get_user_by_name (username);
-    if (!user)
-    {
-        g_warning ("Cannot load .dmrc file, unable to get information on user %s", username);      
-        return dmrc_file;
-    }
-
     /* Load from the user directory, if this fails (e.g. the user directory
      * is not yet mounted) then load from the cache */
-    path = g_build_filename (user_get_home_directory (user), ".dmrc", NULL);
+    path = g_build_filename (common_user_get_home_directory (user), ".dmrc", NULL);
 
     /* Guard against privilege escalation through symlinks, etc. */
     drop_privileges = geteuid () == 0;
     if (drop_privileges)
-        privileges_drop (user);
+        privileges_drop (common_user_get_uid (user), common_user_get_gid (user));
     have_dmrc = g_key_file_load_from_file (dmrc_file, path, G_KEY_FILE_KEEP_COMMENTS, NULL);
     if (drop_privileges)
         privileges_reclaim ();
@@ -53,7 +45,7 @@
     {
         gchar *filename, *cache_dir;
 
-        filename = g_strdup_printf ("%s.dmrc", user_get_name (user));
+        filename = g_strdup_printf ("%s.dmrc", common_user_get_name (user));
         cache_dir = config_get_string (config_get_instance (), "LightDM", "cache-directory");
         path = g_build_filename (cache_dir, "dmrc", filename, NULL);
         g_free (filename);
@@ -63,46 +55,32 @@
         g_free (path);
     }
 
-    g_object_unref (user);
-
     return dmrc_file;
 }
 
 void
-dmrc_save (GKeyFile *dmrc_file, const gchar *username)
+dmrc_save (GKeyFile *dmrc_file, CommonUser *user)
 {
-    User *user;
     gchar *path, *filename, *cache_dir, *dmrc_cache_dir;
     gchar *data;
     gsize length;
-
-    user = accounts_get_user_by_name (username);
-    if (!user)
-    {
-        g_warning ("Not saving DMRC file - unable to get information on user %s", username);
-        return;
-    }
+    gboolean drop_privileges;
 
     data = g_key_file_to_data (dmrc_file, &length, NULL);
 
     /* Update the users .dmrc */
-    if (user)
-    {
-        gboolean drop_privileges;
-
-        path = g_build_filename (user_get_home_directory (user), ".dmrc", NULL);
-
-        /* Guard against privilege escalation through symlinks, etc. */
-        drop_privileges = geteuid () == 0;
-        if (drop_privileges)
-            privileges_drop (user);
-        g_debug ("Writing %s", path);
-        g_file_set_contents (path, data, length, NULL);
-        if (drop_privileges)
-            privileges_reclaim ();
-
-        g_free (path);
-    }
+    path = g_build_filename (common_user_get_home_directory (user), ".dmrc", NULL);
+
+    /* Guard against privilege escalation through symlinks, etc. */
+    drop_privileges = geteuid () == 0;
+    if (drop_privileges)
+        privileges_drop (common_user_get_uid (user), common_user_get_gid (user));
+    g_debug ("Writing %s", path);
+    g_file_set_contents (path, data, length, NULL);
+    if (drop_privileges)
+        privileges_reclaim ();
+
+    g_free (path);
 
     /* Update the .dmrc cache */
     cache_dir = config_get_string (config_get_instance (), "LightDM", "cache-directory");
@@ -110,12 +88,11 @@
     if (g_mkdir_with_parents (dmrc_cache_dir, 0700) < 0)
         g_warning ("Failed to make DMRC cache directory %s: %s", dmrc_cache_dir, strerror (errno));
 
-    filename = g_strdup_printf ("%s.dmrc", username);
+    filename = g_strdup_printf ("%s.dmrc", common_user_get_name (user));
     path = g_build_filename (dmrc_cache_dir, filename, NULL);
     g_file_set_contents (path, data, length, NULL);
 
     g_free (dmrc_cache_dir);
     g_free (path);
     g_free (filename);
-    g_object_unref (user);
 }

=== renamed file 'src/dmrc.h' => 'common/dmrc.h'
--- src/dmrc.h	2013-04-23 03:07:03 +0000
+++ common/dmrc.h	2014-02-08 22:36:44 +0000
@@ -13,12 +13,13 @@
 #define DMRC_H_
 
 #include <glib.h>
+#include "user-list.h"
 
 G_BEGIN_DECLS
 
-GKeyFile *dmrc_load (const gchar *username);
+GKeyFile *dmrc_load (CommonUser *user);
 
-void dmrc_save (GKeyFile *dmrc_file, const gchar *username);
+void dmrc_save (GKeyFile *dmrc_file, CommonUser *user);
 
 G_END_DECLS
 

=== renamed file 'src/privileges.c' => 'common/privileges.c'
--- src/privileges.c	2013-08-26 00:58:45 +0000
+++ common/privileges.c	2014-02-08 22:36:44 +0000
@@ -13,24 +13,24 @@
 #define _GNU_SOURCE
 
 #include <config.h>
+#include <glib.h>
+#include <unistd.h>
 #include "privileges.h"
 
 void
-privileges_drop (User *user)
+privileges_drop (uid_t uid, gid_t gid)
 {
-    g_return_if_fail (user != NULL);
-
 #ifdef HAVE_SETRESGID
-    g_assert (setresgid (user_get_gid (user), user_get_gid (user), -1) == 0);
+    g_assert (setresgid (gid, gid, -1) == 0);
 #else
-    g_assert (setgid (user_get_gid (user)) == 0);
-    g_assert (setegid (user_get_gid (user)) == 0);
+    g_assert (setgid (gid) == 0);
+    g_assert (setegid (gid) == 0);
 #endif
 #ifdef HAVE_SETRESUID
-    g_assert (setresuid (user_get_uid (user), user_get_uid (user), -1) == 0);
+    g_assert (setresuid (uid, uid, -1) == 0);
 #else
-    g_assert (setuid (user_get_uid (user)) == 0);
-    g_assert (seteuid (user_get_uid (user)) == 0);
+    g_assert (setuid (uid) == 0);
+    g_assert (seteuid (uid) == 0);
 #endif
 }
 

=== renamed file 'src/privileges.h' => 'common/privileges.h'
--- src/privileges.h	2013-04-23 03:07:03 +0000
+++ common/privileges.h	2014-02-08 22:36:44 +0000
@@ -12,9 +12,9 @@
 #ifndef PRIVILEGES_H_
 #define PRIVILEGES_H_
 
-#include "accounts.h"
+#include <sys/types.h>
 
-void privileges_drop (User *user);
+void privileges_drop (uid_t uid, gid_t gid);
 
 void privileges_reclaim (void);
 

=== renamed file 'liblightdm-gobject/user.c' => 'common/user-list.c'
--- liblightdm-gobject/user.c	2013-12-12 20:32:47 +0000
+++ common/user-list.c	2014-02-08 22:36:44 +0000
@@ -1,7 +1,9 @@
 /* -*- Mode: C; indent-tabs-mode:nil; tab-width:4 -*-
  *
  * Copyright (C) 2010 Robert Ancell.
- * Author: Robert Ancell <[e-mail]>
+ * Copyright (C) 2014 Canonical, Ltd.
+ * Authors: Robert Ancell <[e-mail]>
+ *          Michael Terry <[e-mail]>
  * 
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
@@ -17,7 +19,8 @@
 #include <pwd.h>
 #include <gio/gio.h>
 
-#include "lightdm/user.h"
+#include "dmrc.h"
+#include "user-list.h"
 
 enum
 {
@@ -33,6 +36,7 @@
     USER_PROP_REAL_NAME,
     USER_PROP_DISPLAY_NAME,
     USER_PROP_HOME_DIRECTORY,
+    USER_PROP_SHELL,
     USER_PROP_IMAGE,
     USER_PROP_BACKGROUND,
     USER_PROP_LANGUAGE,
@@ -40,7 +44,9 @@
     USER_PROP_LAYOUTS,
     USER_PROP_SESSION,
     USER_PROP_LOGGED_IN,
-    USER_PROP_HAS_MESSAGES
+    USER_PROP_HAS_MESSAGES,
+    USER_PROP_UID,
+    USER_PROP_GID,
 };
 
 enum
@@ -83,12 +89,12 @@
 
     /* List of sessions */
     GList *sessions;
-} LightDMUserListPrivate;
+} CommonUserListPrivate;
 
 typedef struct
 {
     /* User list this user is part of */
-    LightDMUserList *user_list;
+    CommonUserList *user_list;
 
     /* TRUE if have loaded user properties */
     gboolean loaded_values;
@@ -96,9 +102,6 @@
     /* Accounts service path */
     gchar *path;
 
-    /* DMRC file */
-    GKeyFile *dmrc_file;
-
     /* Update signal from accounts service */
     guint changed_signal;
 
@@ -111,6 +114,9 @@
     /* Home directory of user */
     gchar *home_directory;
 
+    /* Shell for user */
+    gchar *shell;
+
     /* Image for user */
     gchar *image;
 
@@ -120,6 +126,12 @@
     /* TRUE if this user has messages available */
     gboolean has_messages;
 
+    /* UID of user */
+    guint64 uid;
+
+    /* GID of user */
+    guint64 gid;
+
     /* User chosen language */
     gchar *language;
 
@@ -128,74 +140,82 @@
 
     /* User default session */
     gchar *session;
-} LightDMUserPrivate;
+} CommonUserPrivate;
 
 typedef struct
 {
     GObject parent_instance;
     gchar *path;
     gchar *username;
-} Session;
+} CommonSession;
 
 typedef struct
 {
     GObjectClass parent_class;
-} SessionClass;
-
-G_DEFINE_TYPE (LightDMUserList, lightdm_user_list, G_TYPE_OBJECT);
-G_DEFINE_TYPE (LightDMUser, lightdm_user, G_TYPE_OBJECT);
-#define SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), session_get_type (), Session))
-GType session_get_type (void);
-G_DEFINE_TYPE (Session, session, G_TYPE_OBJECT);
-
-#define GET_LIST_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_USER_LIST, LightDMUserListPrivate)
-#define GET_USER_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_USER, LightDMUserPrivate)
+} CommonSessionClass;
+
+G_DEFINE_TYPE (CommonUserList, common_user_list, G_TYPE_OBJECT);
+G_DEFINE_TYPE (CommonUser, common_user, G_TYPE_OBJECT);
+#define COMMON_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), common_session_get_type (), CommonSession))
+GType common_session_get_type (void);
+G_DEFINE_TYPE (CommonSession, common_session, G_TYPE_OBJECT);
+
+#define GET_LIST_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), COMMON_TYPE_USER_LIST, CommonUserListPrivate)
+#define GET_USER_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), COMMON_TYPE_USER, CommonUserPrivate)
 
 #define PASSWD_FILE      "/etc/passwd"
 #define USER_CONFIG_FILE "/etc/lightdm/users.conf"
 
-static LightDMUserList *singleton = NULL;
+static CommonUserList *singleton = NULL;
 
 /**
- * lightdm_user_list_get_instance:
+ * common_user_list_get_instance:
  *
  * Get the user list.
  *
- * Return value: (transfer none): the #LightDMUserList
+ * Return value: (transfer none): the #CommonUserList
  **/
-LightDMUserList *
-lightdm_user_list_get_instance (void)
+CommonUserList *
+common_user_list_get_instance (void)
 {
     if (!singleton)
-        singleton = g_object_new (LIGHTDM_TYPE_USER_LIST, NULL);
+        singleton = g_object_new (COMMON_TYPE_USER_LIST, NULL);
     return singleton;
 }
 
-static LightDMUser *
-get_user_by_name (LightDMUserList *user_list, const gchar *username)
-{
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+void
+common_user_list_cleanup (void)
+{
+    if (singleton)
+        g_object_unref (singleton);
+    singleton = NULL;
+}
+
+static CommonUser *
+get_user_by_name (CommonUserList *user_list, const gchar *username)
+{
+    CommonUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
     GList *link;
   
     for (link = priv->users; link; link = link->next)
     {
-        LightDMUser *user = link->data;
-        if (g_strcmp0 (lightdm_user_get_name (user), username) == 0)
+        CommonUser *user = link->data;
+        if (g_strcmp0 (common_user_get_name (user), username) == 0)
             return user;
     }
 
     return NULL;
 }
 
-static LightDMUser *
-get_user_by_path (LightDMUserList *user_list, const gchar *path)
+static CommonUser *
+get_user_by_path (CommonUserList *user_list, const gchar *path)
 {
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    CommonUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
     GList *link;
   
     for (link = priv->users; link; link = link->next)
     {
-        LightDMUser *user = link->data;
+        CommonUser *user = link->data;
         if (g_strcmp0 (GET_USER_PRIVATE (user)->path, path) == 0)
             return user;
     }
@@ -206,25 +226,28 @@
 static gint
 compare_user (gconstpointer a, gconstpointer b)
 {
-    LightDMUser *user_a = (LightDMUser *) a, *user_b = (LightDMUser *) b;
-    return g_strcmp0 (lightdm_user_get_display_name (user_a), lightdm_user_get_display_name (user_b));
+    CommonUser *user_a = (CommonUser *) a, *user_b = (CommonUser *) b;
+    return g_strcmp0 (common_user_get_display_name (user_a), common_user_get_display_name (user_b));
 }
 
 static gboolean
-update_passwd_user (LightDMUser *user, const gchar *real_name, const gchar *home_directory, const gchar *image)
+update_passwd_user (CommonUser *user, const gchar *real_name, const gchar *home_directory, const gchar *shell, const gchar *image)
 {
-    LightDMUserPrivate *priv = GET_USER_PRIVATE (user);
+    CommonUserPrivate *priv = GET_USER_PRIVATE (user);
 
     /* Skip if already set to this */
-    if (g_strcmp0 (lightdm_user_get_real_name (user), real_name) == 0 &&
-        g_strcmp0 (lightdm_user_get_home_directory (user), home_directory) == 0 &&
-        g_strcmp0 (lightdm_user_get_image (user), image) == 0)
+    if (g_strcmp0 (common_user_get_real_name (user), real_name) == 0 &&
+        g_strcmp0 (common_user_get_home_directory (user), home_directory) == 0 &&
+        g_strcmp0 (common_user_get_shell (user), shell) == 0 &&
+        g_strcmp0 (common_user_get_image (user), image) == 0)
         return FALSE;
 
     g_free (priv->real_name);
     priv->real_name = g_strdup (real_name);
     g_free (priv->home_directory);
     priv->home_directory = g_strdup (home_directory);
+    g_free (priv->shell);
+    priv->shell = g_strdup (shell);
     g_free (priv->image);
     priv->image = g_strdup (image);
 
@@ -232,15 +255,54 @@
 }
 
 static void
-user_changed_cb (LightDMUser *user)
+user_changed_cb (CommonUser *user)
 {
     g_signal_emit (GET_USER_PRIVATE (user)->user_list, list_signals[USER_CHANGED], 0, user);
 }
 
+static CommonUser *
+make_passwd_user (CommonUserList *user_list, struct passwd *entry)
+{
+    CommonUser *user = g_object_new (COMMON_TYPE_USER, NULL);
+    CommonUserPrivate *priv = GET_USER_PRIVATE (user);
+    char **tokens;
+    gchar *real_name, *image;
+
+    tokens = g_strsplit (entry->pw_gecos, ",", -1);
+    if (tokens[0] != NULL && tokens[0][0] != '\0')
+        real_name = g_strdup (tokens[0]);
+    else
+        real_name = g_strdup ("");
+    g_strfreev (tokens);
+
+    image = g_build_filename (entry->pw_dir, ".face", NULL);
+    if (!g_file_test (image, G_FILE_TEST_EXISTS))
+    {
+        g_free (image);
+        image = g_build_filename (entry->pw_dir, ".face.icon", NULL);
+        if (!g_file_test (image, G_FILE_TEST_EXISTS))
+        {
+            g_free (image);
+            image = NULL;
+        }
+    }
+
+    priv->user_list = user_list;
+    priv->name = g_strdup (entry->pw_name);
+    priv->real_name = real_name;
+    priv->home_directory = g_strdup (entry->pw_dir);
+    priv->shell = g_strdup (entry->pw_shell);
+    priv->image = image;
+    priv->uid = entry->pw_uid;
+    priv->gid = entry->pw_gid;
+
+    return user;
+}
+
 static void
-load_passwd_file (LightDMUserList *user_list, gboolean emit_add_signal)
+load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal)
 {
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    CommonUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
     GKeyFile *config;
     gchar *value;
     gint minimum_uid;
@@ -280,10 +342,7 @@
     while (TRUE)
     {
         struct passwd *entry;
-        LightDMUser *user;
-        LightDMUserPrivate *user_priv;
-        char **tokens;
-        gchar *real_name, *image;
+        CommonUser *user;
         int i;
 
         errno = 0;
@@ -308,44 +367,15 @@
         if (hidden_users[i])
             continue;
 
-        tokens = g_strsplit (entry->pw_gecos, ",", -1);
-        if (tokens[0] != NULL && tokens[0][0] != '\0')
-            real_name = g_strdup (tokens[0]);
-        else
-            real_name = g_strdup ("");
-        g_strfreev (tokens);
-
-        image = g_build_filename (entry->pw_dir, ".face", NULL);
-        if (!g_file_test (image, G_FILE_TEST_EXISTS))
-        {
-            g_free (image);
-            image = g_build_filename (entry->pw_dir, ".face.icon", NULL);
-            if (!g_file_test (image, G_FILE_TEST_EXISTS))
-            {
-                g_free (image);
-                image = NULL;
-            }
-        }
-
-        user = g_object_new (LIGHTDM_TYPE_USER, NULL);
-        user_priv = GET_USER_PRIVATE (user);
-        user_priv->user_list = user_list;
-        g_free (user_priv->name);
-        user_priv->name = g_strdup (entry->pw_name);
-        g_free (user_priv->real_name);
-        user_priv->real_name = real_name;
-        g_free (user_priv->home_directory);
-        user_priv->home_directory = g_strdup (entry->pw_dir);
-        g_free (user_priv->image);
-        user_priv->image = image;
+        user = make_passwd_user (user_list, entry);
 
         /* Update existing users if have them */
         for (link = priv->users; link; link = link->next)
         {
-            LightDMUser *info = link->data;
-            if (strcmp (lightdm_user_get_name (info), lightdm_user_get_name (user)) == 0)
+            CommonUser *info = link->data;
+            if (strcmp (common_user_get_name (info), common_user_get_name (user)) == 0)
             {
-                if (update_passwd_user (info, lightdm_user_get_real_name (user), lightdm_user_get_home_directory (user), lightdm_user_get_image (user)))
+                if (update_passwd_user (info, common_user_get_real_name (user), common_user_get_home_directory (user), common_user_get_shell (user), common_user_get_image (user)))
                     changed_users = g_list_insert_sorted (changed_users, info, compare_user);
                 g_object_unref (user);
                 user = info;
@@ -375,8 +405,8 @@
     /* Notify of changes */
     for (link = new_users; link; link = link->next)
     {
-        LightDMUser *info = link->data;
-        g_debug ("User %s added", lightdm_user_get_name (info));
+        CommonUser *info = link->data;
+        g_debug ("User %s added", common_user_get_name (info));
         g_signal_connect (info, "changed", G_CALLBACK (user_changed_cb), NULL);
         if (emit_add_signal)
             g_signal_emit (user_list, list_signals[USER_ADDED], 0, info);
@@ -384,8 +414,8 @@
     g_list_free (new_users);
     for (link = changed_users; link; link = link->next)
     {
-        LightDMUser *info = link->data;
-        g_debug ("User %s changed", lightdm_user_get_name (info));
+        CommonUser *info = link->data;
+        g_debug ("User %s changed", common_user_get_name (info));
         g_signal_emit (info, user_signals[CHANGED], 0);
     }
     g_list_free (changed_users);
@@ -402,8 +432,8 @@
 
         if (!new_link)
         {
-            LightDMUser *info = link->data;
-            g_debug ("User %s removed", lightdm_user_get_name (info));
+            CommonUser *info = link->data;
+            g_debug ("User %s removed", common_user_get_name (info));
             g_signal_emit (user_list, list_signals[USER_REMOVED], 0, info);
             g_object_unref (info);
         }
@@ -412,7 +442,7 @@
 }
 
 static void
-passwd_changed_cb (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, LightDMUserList *user_list)
+passwd_changed_cb (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, CommonUserList *user_list)
 {
     if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
     {
@@ -421,7 +451,7 @@
     }
 }
 
-static gboolean load_accounts_user (LightDMUser *user);
+static gboolean load_accounts_user (CommonUser *user);
 
 static void
 accounts_user_changed_cb (GDBusConnection *connection,
@@ -432,8 +462,8 @@
                           GVariant *parameters,
                           gpointer data)
 {
-    LightDMUser *user = data;
-    LightDMUserPrivate *priv = GET_USER_PRIVATE (user);  
+    CommonUser *user = data;
+    CommonUserPrivate *priv = GET_USER_PRIVATE (user);  
 
     g_debug ("User %s changed", priv->path);
     if (load_accounts_user (user))
@@ -441,9 +471,9 @@
 }
 
 static gboolean
-load_accounts_user (LightDMUser *user)
+load_accounts_user (CommonUser *user)
 {
-    LightDMUserPrivate *priv = GET_USER_PRIVATE (user);
+    CommonUserPrivate *priv = GET_USER_PRIVATE (user);
     GVariant *result, *value;
     GVariantIter *iter;
     gchar *name;
@@ -498,6 +528,11 @@
             g_free (priv->home_directory);
             priv->home_directory = g_variant_dup_string (value, NULL);
         }
+        else if (strcmp (name, "Shell") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
+        {
+            g_free (priv->shell);
+            priv->shell = g_variant_dup_string (value, NULL);
+        }
         else if (strcmp (name, "SystemAccount") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN))
             system_account = g_variant_get_boolean (value);
         else if (strcmp (name, "Language") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
@@ -543,6 +578,8 @@
         }
         else if (strcmp (name, "XHasMessages") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN))
             priv->has_messages = g_variant_get_boolean (value);
+        else if (strcmp (name, "Uid") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_UINT64))
+            priv->uid = g_variant_get_uint64 (value);
     }
     g_variant_iter_free (iter);
 
@@ -554,13 +591,13 @@
 }
 
 static void
-add_accounts_user (LightDMUserList *user_list, const gchar *path, gboolean emit_signal)
+add_accounts_user (CommonUserList *user_list, const gchar *path, gboolean emit_signal)
 {
-    LightDMUserListPrivate *list_priv = GET_LIST_PRIVATE (user_list);
-    LightDMUser *user;
-    LightDMUserPrivate *priv;
+    CommonUserListPrivate *list_priv = GET_LIST_PRIVATE (user_list);
+    CommonUser *user;
+    CommonUserPrivate *priv;
 
-    user = g_object_new (LIGHTDM_TYPE_USER, NULL);
+    user = g_object_new (COMMON_TYPE_USER, NULL);
     priv = GET_USER_PRIVATE (user);
 
     g_debug ("User %s added", path);
@@ -586,9 +623,9 @@
                         GVariant *parameters,
                         gpointer data)
 {
-    LightDMUserList *user_list = data;
+    CommonUserList *user_list = data;
     gchar *path;
-    LightDMUser *user;
+    CommonUser *user;
   
     if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(o)")))
     {
@@ -613,10 +650,10 @@
                           GVariant *parameters,
                           gpointer data)
 {
-    LightDMUserList *user_list = data;
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    CommonUserList *user_list = data;
+    CommonUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
     gchar *path;
-    LightDMUser *user;
+    CommonUser *user;
 
     if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(o)")))
     {
@@ -639,11 +676,11 @@
     }
 }
 
-static Session *
-load_session (LightDMUserList *user_list, const gchar *path)
+static CommonSession *
+load_session (CommonUserList *user_list, const gchar *path)
 {
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
-    Session *session = NULL;
+    CommonUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    CommonSession *session = NULL;
     GVariant *result, *username;
     GError *error = NULL;
 
@@ -672,7 +709,7 @@
         g_variant_get (username, "&s", &name);
 
         g_debug ("Loaded session %s (%s)", path, name);
-        session = g_object_new (session_get_type (), NULL);
+        session = g_object_new (common_session_get_type (), NULL);
         session->username = g_strdup (name);
         session->path = g_strdup (path);
         priv->sessions = g_list_append (priv->sessions, session);
@@ -692,10 +729,10 @@
                   GVariant *parameters,
                   gpointer data)
 {
-    LightDMUserList *user_list = data;
+    CommonUserList *user_list = data;
     gchar *path;
-    Session *session;
-    LightDMUser *user = NULL;
+    CommonSession *session;
+    CommonUser *user = NULL;
 
     if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(o)")))
     {
@@ -720,8 +757,8 @@
                     GVariant *parameters,
                     gpointer data)
 {
-    LightDMUserList *user_list = data;
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    CommonUserList *user_list = data;
+    CommonUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
     gchar *path;
     GList *link;
 
@@ -735,10 +772,10 @@
 
     for (link = priv->sessions; link; link = link->next)
     {
-        Session *session = link->data;
+        CommonSession *session = link->data;
         if (strcmp (session->path, path) == 0)
         {
-            LightDMUser *user;
+            CommonUser *user;
 
             g_debug ("Session %s removed", path);
             priv->sessions = g_list_remove_link (priv->sessions, link);
@@ -752,9 +789,75 @@
 }
 
 static void
-load_users (LightDMUserList *user_list)
-{
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+load_sessions (CommonUserList *user_list)
+{
+    CommonUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    GVariant *result;
+    GError *error = NULL;
+
+    priv->session_added_signal = g_dbus_connection_signal_subscribe (priv->bus,
+                                                                     "org.freedesktop.DisplayManager",
+                                                                     "org.freedesktop.DisplayManager",
+                                                                     "SessionAdded",
+                                                                     "/org/freedesktop/DisplayManager",
+                                                                     NULL,
+                                                                     G_DBUS_SIGNAL_FLAGS_NONE,
+                                                                     session_added_cb,
+                                                                     user_list,
+                                                                     NULL);
+    priv->session_removed_signal = g_dbus_connection_signal_subscribe (priv->bus,
+                                                                       "org.freedesktop.DisplayManager",
+                                                                       "org.freedesktop.DisplayManager",
+                                                                       "SessionRemoved",
+                                                                       "/org/freedesktop/DisplayManager",
+                                                                       NULL,
+                                                                       G_DBUS_SIGNAL_FLAGS_NONE,
+                                                                       session_removed_cb,
+                                                                       user_list,
+                                                                       NULL);
+    result = g_dbus_connection_call_sync (priv->bus,
+                                          "org.freedesktop.DisplayManager",
+                                          "/org/freedesktop/DisplayManager",
+                                          "org.freedesktop.DBus.Properties",
+                                          "Get",
+                                          g_variant_new ("(ss)", "org.freedesktop.DisplayManager", "Sessions"),
+                                          G_VARIANT_TYPE ("(v)"),
+                                          G_DBUS_CALL_FLAGS_NONE,
+                                          -1,
+                                          NULL,
+                                          &error);
+    if (error)
+        g_warning ("Error getting session list from org.freedesktop.DisplayManager: %s", error->message);
+    g_clear_error (&error);
+    if (result)
+    {
+        if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(v)")))
+        {
+            GVariant *value;
+            GVariantIter *iter;
+            const gchar *path;
+
+            g_variant_get (result, "(v)", &value);
+
+            g_debug ("Loading sessions from org.freedesktop.DisplayManager");
+            g_variant_get (value, "ao", &iter);
+            while (g_variant_iter_loop (iter, "&o", &path))
+                load_session (user_list, path);
+            g_variant_iter_free (iter);
+
+            g_variant_unref (value);
+        }
+        else
+            g_warning ("Unexpected type from org.freedesktop.DisplayManager.Sessions: %s", g_variant_get_type_string (result));
+
+        g_variant_unref (result);
+    }
+}
+
+static void
+load_users (CommonUserList *user_list)
+{
+    CommonUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
     GVariant *result;
     GError *error = NULL;
 
@@ -831,128 +934,83 @@
             g_signal_connect (priv->passwd_monitor, "changed", G_CALLBACK (passwd_changed_cb), user_list);
         g_clear_error (&error);
     }
-
-    priv->session_added_signal = g_dbus_connection_signal_subscribe (priv->bus,
-                                                                     "org.freedesktop.DisplayManager",
-                                                                     "org.freedesktop.DisplayManager",
-                                                                     "SessionAdded",
-                                                                     "/org/freedesktop/DisplayManager",
-                                                                     NULL,
-                                                                     G_DBUS_SIGNAL_FLAGS_NONE,
-                                                                     session_added_cb,
-                                                                     user_list,
-                                                                     NULL);
-    priv->session_removed_signal = g_dbus_connection_signal_subscribe (priv->bus,
-                                                                       "org.freedesktop.DisplayManager",
-                                                                       "org.freedesktop.DisplayManager",
-                                                                       "SessionRemoved",
-                                                                       "/org/freedesktop/DisplayManager",
-                                                                       NULL,
-                                                                       G_DBUS_SIGNAL_FLAGS_NONE,
-                                                                       session_removed_cb,
-
-                                                                    user_list,
-                                                                    NULL);
-    result = g_dbus_connection_call_sync (priv->bus,
-                                          "org.freedesktop.DisplayManager",
-                                          "/org/freedesktop/DisplayManager",
-                                          "org.freedesktop.DBus.Properties",
-                                          "Get",
-                                          g_variant_new ("(ss)", "org.freedesktop.DisplayManager", "Sessions"),
-                                          G_VARIANT_TYPE ("(v)"),
-                                          G_DBUS_CALL_FLAGS_NONE,
-                                          -1,
-                                          NULL,
-                                          &error);
-    if (error)
-        g_warning ("Error getting session list from org.freedesktop.DisplayManager: %s", error->message);
-    g_clear_error (&error);
-    if (result)
-    {
-        if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(v)")))
-        {
-            GVariant *value;
-            GVariantIter *iter;
-            const gchar *path;
-
-            g_variant_get (result, "(v)", &value);
-
-            g_debug ("Loading sessions from org.freedesktop.DisplayManager");
-            g_variant_get (value, "ao", &iter);
-            while (g_variant_iter_loop (iter, "&o", &path))
-                load_session (user_list, path);
-            g_variant_iter_free (iter);
-
-            g_variant_unref (value);
-        }
-        else
-            g_warning ("Unexpected type from org.freedesktop.DisplayManager.Sessions: %s", g_variant_get_type_string (result));
-
-        g_variant_unref (result);
-    }
 }
 
 /**
- * lightdm_user_list_get_length:
- * @user_list: a #LightDMUserList
+ * common_user_list_get_length:
+ * @user_list: a #CommonUserList
  *
  * Return value: The number of users able to log in
  **/
 gint
-lightdm_user_list_get_length (LightDMUserList *user_list)
+common_user_list_get_length (CommonUserList *user_list)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER_LIST (user_list), 0);
+    g_return_val_if_fail (COMMON_IS_USER_LIST (user_list), 0);
     load_users (user_list);
     return g_list_length (GET_LIST_PRIVATE (user_list)->users);
 }
 
 /**
- * lightdm_user_list_get_users:
- * @user_list: A #LightDMUserList
+ * common_user_list_get_users:
+ * @user_list: A #CommonUserList
  *
  * Get a list of users to present to the user.  This list may be a subset of the
  * available users and may be empty depending on the server configuration.
  *
- * Return value: (element-type LightDMUser) (transfer none): A list of #LightDMUser that should be presented to the user.
+ * Return value: (element-type CommonUser) (transfer none): A list of #CommonUser that should be presented to the user.
  **/
 GList *
-lightdm_user_list_get_users (LightDMUserList *user_list)
+common_user_list_get_users (CommonUserList *user_list)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER_LIST (user_list), NULL);
+    g_return_val_if_fail (COMMON_IS_USER_LIST (user_list), NULL);
     load_users (user_list);
     return GET_LIST_PRIVATE (user_list)->users;
 }
 
 /**
- * lightdm_user_list_get_user_by_name:
- * @user_list: A #LightDMUserList
+ * common_user_list_get_user_by_name:
+ * @user_list: A #CommonUserList
  * @username: Name of user to get.
  *
  * Get infomation about a given user or #NULL if this user doesn't exist.
+ * Includes hidden and system users, unlike the list from
+ * common_user_list_get_users.
  *
- * Return value: (transfer none): A #LightDMUser entry for the given user.
+ * Return value: (transfer full): A #CommonUser entry for the given user.
  **/
-LightDMUser *
-lightdm_user_list_get_user_by_name (LightDMUserList *user_list, const gchar *username)
+CommonUser *
+common_user_list_get_user_by_name (CommonUserList *user_list, const gchar *username)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER_LIST (user_list), NULL);
+    g_return_val_if_fail (COMMON_IS_USER_LIST (user_list), NULL);
     g_return_val_if_fail (username != NULL, NULL);
 
     load_users (user_list);
 
-    return get_user_by_name (user_list, username);
+    CommonUser *user = get_user_by_name (user_list, username);
+    if (user)
+        return g_object_ref (user);
+
+    /* Sometimes we need to look up users that aren't in AccountsService.
+       Notably we need to look up the user that the greeter runs as, which
+       is usually 'lightdm'. For such cases, we manually create a one-off
+       CommonUser object and pre-seed with passwd info. */
+    struct passwd *entry = getpwnam (username);
+    if (entry != NULL)
+        return make_passwd_user (user_list, entry);
+
+    return NULL;
 }
 
 static void
-lightdm_user_list_init (LightDMUserList *user_list)
+common_user_list_init (CommonUserList *user_list)
 {
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    CommonUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
 
     priv->bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
 }
 
 static void
-lightdm_user_list_set_property (GObject    *object,
+common_user_list_set_property (GObject    *object,
                                 guint       prop_id,
                                 const GValue *value,
                                 GParamSpec *pspec)
@@ -961,19 +1019,19 @@
 }
 
 static void
-lightdm_user_list_get_property (GObject    *object,
+common_user_list_get_property (GObject    *object,
                                 guint       prop_id,
                                 GValue     *value,
                                 GParamSpec *pspec)
 {
-    LightDMUserList *self;
+    CommonUserList *self;
 
-    self = LIGHTDM_USER_LIST (object);
+    self = COMMON_USER_LIST (object);
 
     switch (prop_id)
     {
     case LIST_PROP_NUM_USERS:
-        g_value_set_int (value, lightdm_user_list_get_length (self));
+        g_value_set_int (value, common_user_list_get_length (self));
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -982,10 +1040,10 @@
 }
 
 static void
-lightdm_user_list_finalize (GObject *object)
+common_user_list_finalize (GObject *object)
 {
-    LightDMUserList *self = LIGHTDM_USER_LIST (object);
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (self);
+    CommonUserList *self = COMMON_USER_LIST (object);
+    CommonUserListPrivate *priv = GET_LIST_PRIVATE (self);
 
     /* Remove children first, they might access us */
     g_list_free_full (priv->users, g_object_unref);
@@ -1003,19 +1061,19 @@
     if (priv->passwd_monitor)
         g_object_unref (priv->passwd_monitor);
 
-    G_OBJECT_CLASS (lightdm_user_list_parent_class)->finalize (object);
+    G_OBJECT_CLASS (common_user_list_parent_class)->finalize (object);
 }
 
 static void
-lightdm_user_list_class_init (LightDMUserListClass *klass)
+common_user_list_class_init (CommonUserListClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (LightDMUserListPrivate));
+    g_type_class_add_private (klass, sizeof (CommonUserListPrivate));
 
-    object_class->set_property = lightdm_user_list_set_property;
-    object_class->get_property = lightdm_user_list_get_property;
-    object_class->finalize = lightdm_user_list_finalize;
+    object_class->set_property = common_user_list_set_property;
+    object_class->get_property = common_user_list_get_property;
+    object_class->finalize = common_user_list_finalize;
 
     g_object_class_install_property (object_class,
                                      LIST_PROP_NUM_USERS,
@@ -1025,9 +1083,9 @@
                                                        0, G_MAXINT, 0,
                                                        G_PARAM_READABLE));
     /**
-     * LightDMUserList::user-added:
-     * @user_list: A #LightDMUserList
-     * @user: The #LightDM user that has been added.
+     * CommonUserList::user-added:
+     * @user_list: A #CommonUserList
+     * @user: The #CommonUser that has been added.
      *
      * The ::user-added signal gets emitted when a user account is created.
      **/
@@ -1035,15 +1093,15 @@
         g_signal_new ("user-added",
                       G_TYPE_FROM_CLASS (klass),
                       G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (LightDMUserListClass, user_added),
+                      G_STRUCT_OFFSET (CommonUserListClass, user_added),
                       NULL, NULL,
                       NULL,
-                      G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
+                      G_TYPE_NONE, 1, COMMON_TYPE_USER);
 
     /**
-     * LightDMUserList::user-changed:
-     * @user_list: A #LightDMUserList
-     * @user: The #LightDM user that has been changed.
+     * CommonUserList::user-changed:
+     * @user_list: A #CommonUserList
+     * @user: The #CommonUser that has been changed.
      *
      * The ::user-changed signal gets emitted when a user account is modified.
      **/
@@ -1051,15 +1109,15 @@
         g_signal_new ("user-changed",
                       G_TYPE_FROM_CLASS (klass),
                       G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (LightDMUserListClass, user_changed),
+                      G_STRUCT_OFFSET (CommonUserListClass, user_changed),
                       NULL, NULL,
                       NULL,
-                      G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
+                      G_TYPE_NONE, 1, COMMON_TYPE_USER);
 
     /**
-     * LightDMUserList::user-removed:
-     * @user_list: A #LightDMUserList
-     * @user: The #LightDM user that has been removed.
+     * CommonUserList::user-removed:
+     * @user_list: A #CommonUserList
+     * @user: The #CommonUser that has been removed.
      *
      * The ::user-removed signal gets emitted when a user account is removed.
      **/
@@ -1067,55 +1125,93 @@
         g_signal_new ("user-removed",
                       G_TYPE_FROM_CLASS (klass),
                       G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (LightDMUserListClass, user_removed),
+                      G_STRUCT_OFFSET (CommonUserListClass, user_removed),
                       NULL, NULL,
                       NULL,
-                      G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
-}
-
-static void
-load_dmrc (LightDMUser *user)
-{
-    LightDMUserPrivate *priv = GET_USER_PRIVATE (user);
-    gchar *path;
-    //gboolean have_dmrc;
-
-    if (!priv->dmrc_file)
-        priv->dmrc_file = g_key_file_new ();
-
-    /* Load from the user directory */  
-    path = g_build_filename (priv->home_directory, ".dmrc", NULL);
-    /*have_dmrc = */g_key_file_load_from_file (priv->dmrc_file, path, G_KEY_FILE_KEEP_COMMENTS, NULL);
-    g_free (path);
-
-    /* If no ~/.dmrc, then load from the cache */
-    // FIXME
+                      G_TYPE_NONE, 1, COMMON_TYPE_USER);
+}
+
+static gboolean
+call_method (CommonUser *user, const gchar *method, GVariant *args,
+             const gchar *expected, GVariant **result)
+{
+    GVariant *answer;
+    GError *error = NULL;
+    CommonUserPrivate *user_priv = GET_USER_PRIVATE (user);
+    CommonUserListPrivate *list_priv = GET_LIST_PRIVATE (user_priv->user_list);
+
+    answer = g_dbus_connection_call_sync (list_priv->bus,
+                                          "org.freedesktop.Accounts",
+                                          user_priv->path,
+                                          "org.freedesktop.Accounts.User",
+                                          method,
+                                          args,
+                                          G_VARIANT_TYPE (expected),
+                                          G_DBUS_CALL_FLAGS_NONE,
+                                          -1,
+                                          NULL,
+                                          &error);
+    if (error)
+        g_warning ("Could not call %s: %s", method, error->message);
+    g_clear_error (&error);
+
+    if (!answer)
+        return FALSE;
+
+    if (result)
+        *result = answer;
+    else
+        g_variant_unref (answer);
+
+    return TRUE;
+}
+
+static void
+save_string_to_dmrc (CommonUser *user, const gchar *group,
+                     const gchar *key, const gchar *value)
+{
+    GKeyFile *dmrc;
+
+    dmrc = dmrc_load (user);
+    g_key_file_set_string (dmrc, group, key, value);
+    dmrc_save (dmrc, user);
+
+    g_key_file_free (dmrc);
+}
+
+static void
+load_dmrc (CommonUser *user)
+{
+    CommonUserPrivate *priv = GET_USER_PRIVATE (user);
+    GKeyFile *dmrc;
+
+    dmrc = dmrc_load (user);
 
     // FIXME: Watch for changes
 
     /* 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);
+    g_free (priv->language);
+    priv->language = g_key_file_get_string (dmrc, "Desktop", "Language", NULL);
 
-    if (g_key_file_has_key (priv->dmrc_file, "Desktop", "Layout", NULL))
+    if (g_key_file_has_key (dmrc, "Desktop", "Layout", NULL))
     {
         g_strfreev (priv->layouts);
         priv->layouts = g_malloc (sizeof (gchar *) * 2);
-        priv->layouts[0] = g_key_file_get_string (priv->dmrc_file, "Desktop", "Layout", NULL);
+        priv->layouts[0] = g_key_file_get_string (dmrc, "Desktop", "Layout", NULL);
         priv->layouts[1] = NULL;
     }
 
-    if (priv->session)
-        g_free (priv->session);
-    priv->session = g_key_file_get_string (priv->dmrc_file, "Desktop", "Session", NULL);
+    g_free (priv->session);
+    priv->session = g_key_file_get_string (dmrc, "Desktop", "Session", NULL);
+
+    g_key_file_free (dmrc);
 }
 
 /* Loads language/layout/session info for user */
 static void
-load_user_values (LightDMUser *user)
+load_user_values (CommonUser *user)
 {
-    LightDMUserPrivate *priv = GET_USER_PRIVATE (user);
+    CommonUserPrivate *priv = GET_USER_PRIVATE (user);
 
     if (priv->loaded_values)
         return;
@@ -1126,51 +1222,51 @@
 }
 
 /**
- * lightdm_user_get_name:
- * @user: A #LightDMUser
+ * common_user_get_name:
+ * @user: A #CommonUser
  * 
  * Get the name of a user.
  * 
  * Return value: The name of the given user
  **/
 const gchar *
-lightdm_user_get_name (LightDMUser *user)
+common_user_get_name (CommonUser *user)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
     load_user_values (user);
     return GET_USER_PRIVATE (user)->name;
 }
 
 /**
- * lightdm_user_get_real_name:
- * @user: A #LightDMUser
+ * common_user_get_real_name:
+ * @user: A #CommonUser
  * 
  * Get the real name of a user.
  *
  * Return value: The real name of the given user
  **/
 const gchar *
-lightdm_user_get_real_name (LightDMUser *user)
+common_user_get_real_name (CommonUser *user)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
     load_user_values (user);
     return GET_USER_PRIVATE (user)->real_name;
 }
 
 /**
- * lightdm_user_get_display_name:
- * @user: A #LightDMUser
+ * common_user_get_display_name:
+ * @user: A #CommonUser
  * 
  * Get the display name of a user.
  * 
  * Return value: The display name of the given user
  **/
 const gchar *
-lightdm_user_get_display_name (LightDMUser *user)
+common_user_get_display_name (CommonUser *user)
 {
-    LightDMUserPrivate *priv;
+    CommonUserPrivate *priv;
 
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
 
     load_user_values (user);
 
@@ -1182,140 +1278,198 @@
 }
 
 /**
- * lightdm_user_get_home_directory:
- * @user: A #LightDMUser
+ * common_user_get_home_directory:
+ * @user: A #CommonUser
  * 
  * Get the home directory for a user.
  * 
  * Return value: The users home directory
  */
 const gchar *
-lightdm_user_get_home_directory (LightDMUser *user)
+common_user_get_home_directory (CommonUser *user)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
     load_user_values (user);
     return GET_USER_PRIVATE (user)->home_directory;
 }
 
 /**
- * lightdm_user_get_image:
- * @user: A #LightDMUser
+ * common_user_get_shell:
+ * @user: A #CommonUser
+ * 
+ * Get the shell for a user.
+ * 
+ * Return value: The user's shell
+ */
+const gchar *
+common_user_get_shell (CommonUser *user)
+{
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
+    load_user_values (user);
+    return GET_USER_PRIVATE (user)->shell;
+}
+
+/**
+ * common_user_get_image:
+ * @user: A #CommonUser
  * 
  * Get the image URI for a user.
  * 
  * Return value: The image URI for the given user or #NULL if no URI
  **/
 const gchar *
-lightdm_user_get_image (LightDMUser *user)
+common_user_get_image (CommonUser *user)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
     load_user_values (user);
     return GET_USER_PRIVATE (user)->image;
 }
 
 /**
- * lightdm_user_get_background:
- * @user: A #LightDMUser
+ * common_user_get_background:
+ * @user: A #CommonUser
  * 
  * Get the background file path for a user.
  * 
  * Return value: The background file path for the given user or #NULL if no path
  **/
 const gchar *
-lightdm_user_get_background (LightDMUser *user)
+common_user_get_background (CommonUser *user)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
     load_user_values (user);
     return GET_USER_PRIVATE (user)->background;
 }
 
 /**
- * lightdm_user_get_language:
- * @user: A #LightDMUser
+ * common_user_get_language:
+ * @user: A #CommonUser
  * 
  * Get the language for a user.
  * 
  * Return value: The language in the form of a local specification (e.g. "de_DE.UTF-8") for the given user or #NULL if using the system default locale.
  **/
 const gchar *
-lightdm_user_get_language (LightDMUser *user)
+common_user_get_language (CommonUser *user)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
     load_user_values (user);
-    return GET_USER_PRIVATE (user)->language;
-}
-
-/**
- * lightdm_user_get_layout:
- * @user: A #LightDMUser
+    const gchar *language = GET_USER_PRIVATE (user)->language;
+    return (language && language[0] == 0) ? NULL : language; /* Treat "" as NULL */
+}
+
+/**
+ * common_user_set_language:
+ * @user: A #CommonUser
+ * @language: The user's new language
+ * 
+ * Set the language for a user.
+ **/
+void
+common_user_set_language (CommonUser *user, const gchar *language)
+{
+    g_return_if_fail (COMMON_IS_USER (user));
+    if (g_strcmp0 (common_user_get_language (user), language) != 0)
+    {
+        call_method (user, "SetLanguage", g_variant_new ("(s)", language), "()", NULL);
+        save_string_to_dmrc (user, "Desktop", "Language", language);
+    }
+}
+
+/**
+ * common_user_get_layout:
+ * @user: A #CommonUser
  * 
  * Get the keyboard layout for a user.
  * 
  * Return value: The keyboard layout for the given user or #NULL if using system defaults.  Copy the value if you want to use it long term.
  **/
 const gchar *
-lightdm_user_get_layout (LightDMUser *user)
+common_user_get_layout (CommonUser *user)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
     load_user_values (user);
     return GET_USER_PRIVATE (user)->layouts[0];
 }
 
 /**
- * lightdm_user_get_layouts:
- * @user: A #LightDMUser
+ * common_user_get_layouts:
+ * @user: A #CommonUser
  * 
  * Get the configured keyboard layouts for a user.
  * 
  * Return value: (transfer none): A NULL-terminated array of keyboard layouts for the given user.  Copy the values if you want to use them long term.
  **/
 const gchar * const *
-lightdm_user_get_layouts (LightDMUser *user)
+common_user_get_layouts (CommonUser *user)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
     load_user_values (user);
     return (const gchar * const *) GET_USER_PRIVATE (user)->layouts;
 }
 
 /**
- * lightdm_user_get_session:
- * @user: A #LightDMUser
+ * common_user_get_session:
+ * @user: A #CommonUser
  * 
  * Get the session for a user.
  * 
  * Return value: The session for the given user or #NULL if using system defaults.
  **/
 const gchar *
-lightdm_user_get_session (LightDMUser *user)
+common_user_get_session (CommonUser *user)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    g_return_val_if_fail (COMMON_IS_USER (user), NULL);
     load_user_values (user);
-    return GET_USER_PRIVATE (user)->session; 
-}
-
-/**
- * lightdm_user_get_logged_in:
- * @user: A #LightDMUser
+    const gchar *session = GET_USER_PRIVATE (user)->session;
+    return (session && session[0] == 0) ? NULL : session; /* Treat "" as NULL */
+}
+
+/**
+ * common_user_set_session:
+ * @user: A #CommonUser
+ * @language: The user's new session
+ * 
+ * Set the session for a user.
+ **/
+void
+common_user_set_session (CommonUser *user, const gchar *session)
+{
+    g_return_if_fail (COMMON_IS_USER (user));
+    if (g_strcmp0 (common_user_get_session (user), session) != 0)
+    {
+        call_method (user, "SetXSession", g_variant_new ("(s)", session), "()", NULL);
+        save_string_to_dmrc (user, "Desktop", "Session", session);
+    }
+}
+
+/**
+ * common_user_get_logged_in:
+ * @user: A #CommonUser
  * 
  * Check if a user is logged in.
  * 
  * Return value: #TRUE if the user is currently logged in.
  **/
 gboolean
-lightdm_user_get_logged_in (LightDMUser *user)
+common_user_get_logged_in (CommonUser *user)
 {
-    LightDMUserPrivate *priv;
-    LightDMUserListPrivate *list_priv;
+    CommonUserPrivate *priv;
+    CommonUserListPrivate *list_priv;
     GList *link;
 
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), FALSE);
+    g_return_val_if_fail (COMMON_IS_USER (user), FALSE);
 
     priv = GET_USER_PRIVATE (user);
     list_priv = GET_LIST_PRIVATE (priv->user_list);
 
+    // Lazily decide to load/listen to sessions
+    if (list_priv->session_added_signal == 0)
+        load_sessions (priv->user_list);
+
     for (link = list_priv->sessions; link; link = link->next)
     {
-        Session *session = link->data;
+        CommonSession *session = link->data;
         if (strcmp (session->username, priv->name) == 0)
             return TRUE;
     }
@@ -1324,31 +1478,73 @@
 }
 
 /**
- * lightdm_user_get_has_messages:
- * @user: A #LightDMUser
+ * common_user_get_has_messages:
+ * @user: A #CommonUser
  * 
  * Check if a user has waiting messages.
  * 
  * Return value: #TRUE if the user has waiting messages.
  **/
 gboolean
-lightdm_user_get_has_messages (LightDMUser *user)
+common_user_get_has_messages (CommonUser *user)
 {
-    g_return_val_if_fail (LIGHTDM_IS_USER (user), FALSE);
+    g_return_val_if_fail (COMMON_IS_USER (user), FALSE);
     load_user_values (user);
     return GET_USER_PRIVATE (user)->has_messages;
 }
 
+/**
+ * common_user_get_uid:
+ * @user: A #CommonUser
+ * 
+ * Get the uid of a user
+ * 
+ * Return value: The user's uid
+ **/
+uid_t
+common_user_get_uid (CommonUser *user)
+{
+    g_return_val_if_fail (COMMON_IS_USER (user), 0);
+    load_user_values (user);
+    return GET_USER_PRIVATE (user)->uid;
+}
+
+/**
+ * common_user_get_gid:
+ * @user: A #CommonUser
+ * 
+ * Get the gid of a user
+ * 
+ * Return value: The user's gid
+ **/
+gid_t
+common_user_get_gid (CommonUser *user)
+{
+    g_return_val_if_fail (COMMON_IS_USER (user), 0);
+    load_user_values (user);
+    /* gid is not actually stored in AccountsService, so if our user is from
+       AccountsService, we have to look up manually in passwd.  gid won't
+       change, so just look up the first time we're asked and never again. */
+    CommonUserPrivate *priv = GET_USER_PRIVATE (user);
+    if (priv->uid != 0 && priv->gid == 0)
+    {
+        struct passwd *entry = getpwuid (priv->uid);
+        if (entry != NULL)
+            priv->gid = entry->pw_gid;
+    }
+    return priv->gid;
+}
+
 static void
-lightdm_user_init (LightDMUser *user)
+common_user_init (CommonUser *user)
 {
-    LightDMUserPrivate *priv = GET_USER_PRIVATE (user);
+    CommonUserPrivate *priv = GET_USER_PRIVATE (user);
     priv->layouts = g_malloc (sizeof (gchar *) * 1);
     priv->layouts[0] = NULL;
 }
 
 static void
-lightdm_user_set_property (GObject    *object,
+common_user_set_property (GObject    *object,
                            guint       prop_id,
                            const GValue *value,
                            GParamSpec *pspec)
@@ -1357,52 +1553,61 @@
 }
 
 static void
-lightdm_user_get_property (GObject    *object,
+common_user_get_property (GObject    *object,
                            guint       prop_id,
                            GValue     *value,
                            GParamSpec *pspec)
 {
-    LightDMUser *self;
+    CommonUser *self;
 
-    self = LIGHTDM_USER (object);
+    self = COMMON_USER (object);
 
     switch (prop_id)
     {
     case USER_PROP_NAME:
-        g_value_set_string (value, lightdm_user_get_name (self));
+        g_value_set_string (value, common_user_get_name (self));
         break;
     case USER_PROP_REAL_NAME:
-        g_value_set_string (value, lightdm_user_get_real_name (self));
+        g_value_set_string (value, common_user_get_real_name (self));
         break;
     case USER_PROP_DISPLAY_NAME:
-        g_value_set_string (value, lightdm_user_get_display_name (self));
+        g_value_set_string (value, common_user_get_display_name (self));
         break;
     case USER_PROP_HOME_DIRECTORY:
-        g_value_set_string (value, lightdm_user_get_home_directory (self));
+        g_value_set_string (value, common_user_get_home_directory (self));
+        break;
+    case USER_PROP_SHELL:
+        g_value_set_string (value, common_user_get_shell (self));
         break;
     case USER_PROP_IMAGE:
-        g_value_set_string (value, lightdm_user_get_image (self));
+        g_value_set_string (value, common_user_get_image (self));
         break;
     case USER_PROP_BACKGROUND:
-        g_value_set_string (value, lightdm_user_get_background (self));
+        g_value_set_string (value, common_user_get_background (self));
         break;
     case USER_PROP_LANGUAGE:
-        g_value_set_string (value, lightdm_user_get_language (self));
+        g_value_set_string (value, common_user_get_language (self));
         break;
     case USER_PROP_LAYOUT:
-        g_value_set_string (value, lightdm_user_get_layout (self));
+        g_value_set_string (value, common_user_get_layout (self));
         break;
     case USER_PROP_LAYOUTS:
-        g_value_set_boxed (value, g_strdupv ((gchar **) lightdm_user_get_layouts (self)));
+        g_value_set_boxed (value, g_strdupv ((gchar **) common_user_get_layouts (self)));
         break;
     case USER_PROP_SESSION:
-        g_value_set_string (value, lightdm_user_get_session (self));
+        g_value_set_string (value, common_user_get_session (self));
         break;
     case USER_PROP_LOGGED_IN:
-        g_value_set_boolean (value, lightdm_user_get_logged_in (self));
+        g_value_set_boolean (value, common_user_get_logged_in (self));
         break;
     case USER_PROP_HAS_MESSAGES:
-        g_value_set_boolean (value, lightdm_user_get_has_messages (self));
+        g_value_set_boolean (value, common_user_get_has_messages (self));
+        break;
+    case USER_PROP_UID:
+        g_value_set_uint64 (value, common_user_get_uid (self));
+        break;
+    case USER_PROP_GID:
+        g_value_set_uint64 (value, common_user_get_gid (self));
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1411,10 +1616,10 @@
 }
 
 static void
-lightdm_user_finalize (GObject *object)
+common_user_finalize (GObject *object)
 {
-    LightDMUser *self = LIGHTDM_USER (object);
-    LightDMUserPrivate *priv = GET_USER_PRIVATE (self);
+    CommonUser *self = COMMON_USER (object);
+    CommonUserPrivate *priv = GET_USER_PRIVATE (self);
 
     g_free (priv->path);
     if (priv->changed_signal)
@@ -1422,23 +1627,22 @@
     g_free (priv->name);
     g_free (priv->real_name);
     g_free (priv->home_directory);
+    g_free (priv->shell);
     g_free (priv->image);
     g_free (priv->background);
     g_strfreev (priv->layouts);
-    if (priv->dmrc_file)
-        g_key_file_free (priv->dmrc_file);
 }
 
 static void
-lightdm_user_class_init (LightDMUserClass *klass)
+common_user_class_init (CommonUserClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
   
-    g_type_class_add_private (klass, sizeof (LightDMUserPrivate));
+    g_type_class_add_private (klass, sizeof (CommonUserPrivate));
 
-    object_class->set_property = lightdm_user_set_property;
-    object_class->get_property = lightdm_user_get_property;
-    object_class->finalize = lightdm_user_finalize;
+    object_class->set_property = common_user_set_property;
+    object_class->get_property = common_user_get_property;
+    object_class->finalize = common_user_finalize;
 
     g_object_class_install_property (object_class,
                                      USER_PROP_NAME,
@@ -1469,6 +1673,13 @@
                                                           NULL,
                                                           G_PARAM_READWRITE));
     g_object_class_install_property (object_class,
+                                     USER_PROP_SHELL,
+                                     g_param_spec_string ("shell",
+                                                          "shell",
+                                                          "Shell",
+                                                          NULL,
+                                                          G_PARAM_READWRITE));
+    g_object_class_install_property (object_class,
                                      USER_PROP_IMAGE,
                                      g_param_spec_string ("image",
                                                           "image",
@@ -1524,10 +1735,28 @@
                                                            "TRUE if the user is has waiting messages",
                                                            FALSE,
                                                            G_PARAM_READWRITE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_UID,
+                                     g_param_spec_uint64 ("uid",
+                                                          "uid",
+                                                          "Uid",
+                                                          0,
+                                                          G_MAXUINT64,
+                                                          0,
+                                                          G_PARAM_READWRITE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_GID,
+                                     g_param_spec_uint64 ("gd",
+                                                          "gid",
+                                                          "Gid",
+                                                          0,
+                                                          G_MAXUINT64,
+                                                          0,
+                                                          G_PARAM_READWRITE));
 
     /**
-     * LightDMUser::changed:
-     * @user: A #LightDMUser
+     * CommonUser::changed:
+     * @user: A #CommonUser
      *
      * The ::changed signal gets emitted this user account is modified.
      **/
@@ -1535,29 +1764,29 @@
         g_signal_new ("changed",
                       G_TYPE_FROM_CLASS (klass),
                       G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (LightDMUserClass, changed),
+                      G_STRUCT_OFFSET (CommonUserClass, changed),
                       NULL, NULL,
                       NULL,
                       G_TYPE_NONE, 0);
 }
 
 static void
-session_init (Session *session)
+common_session_init (CommonSession *common_session)
 {
 }
 
 static void
-session_finalize (GObject *object)
+common_session_finalize (GObject *object)
 {
-    Session *self = SESSION (object);
+    CommonSession *self = COMMON_SESSION (object);
 
     g_free (self->path);
     g_free (self->username);
 }
 
 static void
-session_class_init (SessionClass *klass)
+common_session_class_init (CommonSessionClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
-    object_class->finalize = session_finalize;
+    object_class->finalize = common_session_finalize;
 }

=== added file 'common/user-list.h'
--- common/user-list.h	1970-01-01 00:00:00 +0000
+++ common/user-list.h	2014-02-08 22:36:44 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2010 Robert Ancell.
+ * Copyright (C) 2014 Canonical, Ltd.
+ * Authors: Robert Ancell <[e-mail]>
+ *          Michael Terry <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2 or version 3 of the License.
+ * See http://www.gnu.org/copyleft/lgpl.html the full text of the license.
+ */
+
+#ifndef COMMON_USER_LIST_H_
+#define COMMON_USER_LIST_H_
+
+#include <glib-object.h>
+#include <sys/types.h>
+
+G_BEGIN_DECLS
+
+#define COMMON_TYPE_USER_LIST            (common_user_list_get_type())
+#define COMMON_USER_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), COMMON_TYPE_USER_LIST, CommonUserList));
+#define COMMON_USER_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), COMMON_TYPE_USER_LIST, CommonUserListClass))
+#define COMMON_IS_USER_LIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), COMMON_TYPE_USER_LIST))
+#define COMMON_IS_USER_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), COMMON_TYPE_USER_LIST))
+#define COMMON_USER_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), COMMON_TYPE_USER_LIST, CommonUserListClass))
+
+#define COMMON_TYPE_USER            (common_user_get_type())
+#define COMMON_USER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), COMMON_TYPE_USER, CommonUser));
+#define COMMON_USER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), COMMON_TYPE_USER, CommonUserClass))
+#define COMMON_IS_USER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), COMMON_TYPE_USER))
+#define COMMON_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), COMMON_TYPE_USER))
+#define COMMON_USER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), COMMON_TYPE_USER, CommonUserClass))
+
+typedef struct
+{
+    GObject parent_instance;
+} CommonUser;
+
+typedef struct
+{
+    GObjectClass parent_class;
+
+    void (*changed)(CommonUser *user);
+} CommonUserClass;
+
+typedef struct
+{
+    GObject parent_instance;
+} CommonUserList;
+
+typedef struct
+{
+    GObjectClass parent_class;
+
+    void (*user_added)(CommonUserList *user_list, CommonUser *user);
+    void (*user_changed)(CommonUserList *user_list, CommonUser *user);
+    void (*user_removed)(CommonUserList *user_list, CommonUser *user);
+} CommonUserListClass;
+
+GType common_user_list_get_type (void);
+
+GType common_user_get_type (void);
+
+CommonUserList *common_user_list_get_instance (void);
+
+void common_user_list_cleanup (void);
+
+gint common_user_list_get_length (CommonUserList *user_list);
+
+CommonUser *common_user_list_get_user_by_name (CommonUserList *user_list, const gchar *username);
+
+GList *common_user_list_get_users (CommonUserList *user_list);
+
+const gchar *common_user_get_name (CommonUser *user);
+
+const gchar *common_user_get_real_name (CommonUser *user);
+
+const gchar *common_user_get_display_name (CommonUser *user);
+
+const gchar *common_user_get_home_directory (CommonUser *user);
+
+const gchar *common_user_get_shell (CommonUser *user);
+
+const gchar *common_user_get_image (CommonUser *user);
+
+const gchar *common_user_get_background (CommonUser *user);
+
+const gchar *common_user_get_language (CommonUser *user);
+
+void common_user_set_language (CommonUser *user, const gchar *language);
+
+const gchar *common_user_get_layout (CommonUser *user);
+
+const gchar * const *common_user_get_layouts (CommonUser *user);
+
+const gchar *common_user_get_session (CommonUser *user);
+
+void common_user_set_session (CommonUser *user, const gchar *session);
+
+gboolean common_user_get_logged_in (CommonUser *user);
+
+gboolean common_user_get_has_messages (CommonUser *user);
+
+uid_t common_user_get_uid (CommonUser *user);
+
+gid_t common_user_get_gid (CommonUser *user);
+
+G_END_DECLS
+
+#endif /* COMMON_USER_LIST_H_ */

=== modified file 'configure.ac'
--- configure.ac	2014-02-06 15:35:02 +0000
+++ configure.ac	2014-02-08 22:36:44 +0000
@@ -211,6 +211,7 @@
 
 AC_CONFIG_FILES([
 Makefile
+common/Makefile
 data/Makefile
 doc/Makefile
 help/Makefile

=== modified file 'debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch'
--- debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch	2013-12-09 04:14:30 +0000
+++ debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch	2014-02-08 22:36:44 +0000
@@ -1,16 +1,16 @@
 # Description: Remove unity-2d (not anymore supported) and transition to unity
 #              starting from quantal. llvmpipe is used in case no hardware
 #              acceleration is available.
-=== modified file 'liblightdm-gobject/user.c'
-Index: trunk/liblightdm-gobject/user.c
+=== modified file 'common/user-list.c'
+Index: trunk/common/user-list.c
 ===================================================================
---- trunk.orig/liblightdm-gobject/user.c	2013-12-09 17:13:47.918244873 +1300
-+++ trunk/liblightdm-gobject/user.c	2013-12-09 17:13:47.910244873 +1300
-@@ -1123,6 +1123,12 @@
+--- trunk.orig/common/user-list.c	2014-02-08 17:09:03.157580601 -0500
++++ trunk/common/user-list.c	2014-02-08 17:34:52.897555476 -0500
+@@ -1219,6 +1219,12 @@
  
      if (!priv->path)
          load_dmrc (user);
-+ 
++
 +    if (g_strcmp0 (priv->session, "ubuntu-2d") == 0)
 +    {
 +        g_free(priv->session);

=== modified file 'liblightdm-gobject/Makefile.am'
--- liblightdm-gobject/Makefile.am	2013-07-23 02:24:45 +0000
+++ liblightdm-gobject/Makefile.am	2014-02-08 22:36:44 +0000
@@ -1,9 +1,12 @@
 lib_LTLIBRARIES = liblightdm-gobject-1.la
 
 liblightdm_gobject_1_la_LDFLAGS = -export-symbols-regex \^lightdm_.*
-liblightdm_gobject_1_la_LIBADD = $(LIBLIGHTDM_GOBJECT_LIBS)
+liblightdm_gobject_1_la_LIBADD = \
+	$(LIBLIGHTDM_GOBJECT_LIBS) \
+	$(top_builddir)/common/libcommon.la
 liblightdm_gobject_1_la_CFLAGS = $(LIBLIGHTDM_GOBJECT_CFLAGS) \
 	$(WARN_CFLAGS) \
+	-I"$(top_srcdir)/common" \
 	-DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \
 	-DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions\" \
 	-DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\"

=== modified file 'liblightdm-gobject/session.c'
--- liblightdm-gobject/session.c	2013-12-12 20:32:47 +0000
+++ liblightdm-gobject/session.c	2014-02-08 22:36:44 +0000
@@ -11,6 +11,7 @@
 #include <string.h>
 #include <gio/gdesktopappinfo.h>
 
+#include "configuration.h"
 #include "lightdm/session.h"
 
 enum {
@@ -191,7 +192,6 @@
 static void
 update_sessions (void)
 {
-    GKeyFile *config_key_file = NULL;
     gchar *config_path = NULL;
     gchar *sessions_dir;
     gchar *remote_sessions_dir;
@@ -207,8 +207,8 @@
     /* Use session directory from configuration */
     /* FIXME: This should be sent in the greeter connection */
     config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL);
-    config_key_file = g_key_file_new ();
-    result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error);
+    /* FIXME: This should load from lightdm.conf.d as well */
+    result = config_load_from_file (config_get_instance (), config_path, &error);
     if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
         g_warning ("Failed to open configuration file: %s", error->message);
     g_clear_error (&error);
@@ -216,21 +216,20 @@
     {
         gchar *value;
       
-        value = g_key_file_get_string (config_key_file, "LightDM", "sessions-directory", NULL);
+        value = config_get_string (config_get_instance (), "LightDM", "sessions-directory");
         if (value)
         {
             g_free (sessions_dir);
             sessions_dir = value;
         }
 
-        value = g_key_file_get_string (config_key_file, "LightDM", "remote-sessions-directory", NULL);
+        value = config_get_string (config_get_instance (), "LightDM", "remote-sessions-directory");
         if (value)
         {
             g_free (remote_sessions_dir);
             remote_sessions_dir = value;
         }
     }
-    g_key_file_free (config_key_file);
     g_free (config_path);
 
     local_sessions = load_sessions (sessions_dir);

=== added file 'liblightdm-gobject/user.c'
--- liblightdm-gobject/user.c	1970-01-01 00:00:00 +0000
+++ liblightdm-gobject/user.c	2014-02-08 22:36:44 +0000
@@ -0,0 +1,736 @@
+/* -*- Mode: C; indent-tabs-mode:nil; tab-width:4 -*-
+ *
+ * Copyright (C) 2010 Robert Ancell.
+ * Copyright (C) 2014 Canonical, Ltd.
+ * Authors: Robert Ancell <[e-mail]>
+ *          Michael Terry <[e-mail]>
+ * 
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2 or version 3 of the License.
+ * See http://www.gnu.org/copyleft/lgpl.html the full text of the license.
+ */
+
+#include <config.h>
+
+#include "user-list.h"
+#include "lightdm/user.h"
+
+enum
+{
+    LIST_PROP_0,
+    LIST_PROP_NUM_USERS,
+    LIST_PROP_USERS,
+};
+
+enum
+{
+    USER_PROP_0,
+    USER_PROP_COMMON_USER,
+    USER_PROP_NAME,
+    USER_PROP_REAL_NAME,
+    USER_PROP_DISPLAY_NAME,
+    USER_PROP_HOME_DIRECTORY,
+    USER_PROP_IMAGE,
+    USER_PROP_BACKGROUND,
+    USER_PROP_LANGUAGE,
+    USER_PROP_LAYOUT,
+    USER_PROP_LAYOUTS,
+    USER_PROP_SESSION,
+    USER_PROP_LOGGED_IN,
+    USER_PROP_HAS_MESSAGES
+};
+
+enum
+{
+    USER_ADDED,
+    USER_CHANGED,
+    USER_REMOVED,
+    LAST_LIST_SIGNAL
+};
+static guint list_signals[LAST_LIST_SIGNAL] = { 0 };
+
+enum
+{
+    CHANGED,
+    LAST_USER_SIGNAL
+};
+static guint user_signals[LAST_USER_SIGNAL] = { 0 };
+
+typedef struct
+{
+    gboolean initialized;
+
+    /* Wrapper list, kept locally to preserve transfer-none promises */
+    GList *lightdm_list;
+} LightDMUserListPrivate;
+
+typedef struct
+{
+    CommonUser *common_user;
+} LightDMUserPrivate;
+
+G_DEFINE_TYPE (LightDMUserList, lightdm_user_list, G_TYPE_OBJECT);
+G_DEFINE_TYPE (LightDMUser, lightdm_user, G_TYPE_OBJECT);
+
+#define GET_LIST_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_USER_LIST, LightDMUserListPrivate)
+#define GET_USER_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_USER, LightDMUserPrivate)
+
+static LightDMUserList *singleton = NULL;
+
+/**
+ * lightdm_user_list_get_instance:
+ *
+ * Get the user list.
+ *
+ * Return value: (transfer none): the #LightDMUserList
+ **/
+LightDMUserList *
+lightdm_user_list_get_instance (void)
+{
+    if (!singleton)
+        singleton = g_object_new (LIGHTDM_TYPE_USER_LIST, NULL);
+    return singleton;
+}
+
+static void
+user_changed_cb (CommonUser *common_user, LightDMUser *lightdm_user)
+{
+    g_signal_emit (lightdm_user, user_signals[CHANGED], 0);
+}
+
+static LightDMUser *
+wrap_common_user (CommonUser *user)
+{
+    LightDMUser *lightdm_user = g_object_new (LIGHTDM_TYPE_USER, "common-user", user, NULL);
+    g_signal_connect (user, "changed", G_CALLBACK (user_changed_cb), lightdm_user);
+    return lightdm_user;
+}
+
+static void
+user_list_added_cb (CommonUserList *common_list, CommonUser *common_user, LightDMUserList *user_list)
+{
+    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    GList *common_users = common_user_list_get_users (common_list);
+    LightDMUser *lightdm_user = wrap_common_user (common_user);
+    priv->lightdm_list = g_list_insert (priv->lightdm_list, lightdm_user, g_list_index (common_users, common_user));
+    g_signal_emit (user_list, list_signals[USER_ADDED], 0, lightdm_user);
+}
+
+static void
+user_list_changed_cb (CommonUserList *common_list, CommonUser *common_user, LightDMUserList *user_list)
+{
+    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    GList *common_users = common_user_list_get_users (common_list);
+    LightDMUser *lightdm_user = g_list_nth_data (priv->lightdm_list, g_list_index (common_users, common_user));
+    g_signal_emit (user_list, list_signals[USER_CHANGED], 0, lightdm_user);
+}
+
+static void
+user_list_removed_cb (CommonUserList *common_list, CommonUser *common_user, LightDMUserList *user_list)
+{
+    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    GList *link;
+
+    for (link = priv->lightdm_list; link; link = link->next)
+    {
+        LightDMUser *lightdm_user = link->data;
+        LightDMUserPrivate *user_priv = GET_USER_PRIVATE (lightdm_user);
+        if (user_priv->common_user == common_user)
+        {
+            priv->lightdm_list = g_list_delete_link (priv->lightdm_list, link);
+            g_signal_emit (user_list, list_signals[USER_REMOVED], 0, lightdm_user);
+            g_object_unref (lightdm_user);
+            break;
+        }
+    }
+}
+
+static void
+initialize_user_list_if_needed (LightDMUserList *user_list)
+{
+    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
+    GList *common_users;
+    GList *link;
+
+    if (priv->initialized)
+        return;
+
+    common_users = common_user_list_get_users (common_user_list_get_instance ());
+    for (link = common_users; link; link = link->next)
+    {
+        CommonUser *user = link->data;
+        LightDMUser *lightdm_user = wrap_common_user (user);
+        priv->lightdm_list = g_list_prepend (priv->lightdm_list, lightdm_user);
+    }
+    priv->lightdm_list = g_list_reverse (priv->lightdm_list);
+
+    CommonUserList *common_list = common_user_list_get_instance ();
+    g_signal_connect (common_list, "user-added", G_CALLBACK (user_list_added_cb), user_list);
+    g_signal_connect (common_list, "user-changed", G_CALLBACK (user_list_changed_cb), user_list);
+    g_signal_connect (common_list, "user-removed", G_CALLBACK (user_list_removed_cb), user_list);
+
+    priv->initialized = TRUE;
+}
+
+/**
+ * lightdm_user_list_get_length:
+ * @user_list: a #LightDMUserList
+ *
+ * Return value: The number of users able to log in
+ **/
+gint
+lightdm_user_list_get_length (LightDMUserList *user_list)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER_LIST (user_list), 0);
+    initialize_user_list_if_needed (user_list);
+    return g_list_length (GET_LIST_PRIVATE (user_list)->lightdm_list);
+}
+
+/**
+ * lightdm_user_list_get_users:
+ * @user_list: A #LightDMUserList
+ *
+ * Get a list of users to present to the user.  This list may be a subset of the
+ * available users and may be empty depending on the server configuration.
+ *
+ * Return value: (element-type LightDMUser) (transfer none): A list of #LightDMUser that should be presented to the user.
+ **/
+GList *
+lightdm_user_list_get_users (LightDMUserList *user_list)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER_LIST (user_list), NULL);
+    initialize_user_list_if_needed (user_list);
+    return GET_LIST_PRIVATE (user_list)->lightdm_list;
+}
+
+/**
+ * lightdm_user_list_get_user_by_name:
+ * @user_list: A #LightDMUserList
+ * @username: Name of user to get.
+ *
+ * Get infomation about a given user or #NULL if this user doesn't exist.
+ *
+ * Return value: (transfer none): A #LightDMUser entry for the given user.
+ **/
+LightDMUser *
+lightdm_user_list_get_user_by_name (LightDMUserList *user_list, const gchar *username)
+{
+    GList *link;
+
+    g_return_val_if_fail (LIGHTDM_IS_USER_LIST (user_list), NULL);
+    g_return_val_if_fail (username != NULL, NULL);
+
+    initialize_user_list_if_needed (user_list);
+
+    for (link = GET_LIST_PRIVATE (user_list)->lightdm_list; link; link = link->next)
+    {
+        LightDMUser *user = link->data;
+        if (g_strcmp0 (lightdm_user_get_name (user), username) == 0)
+            return user;
+    }
+
+    return NULL;
+}
+
+static void
+lightdm_user_list_init (LightDMUserList *user_list)
+{
+}
+
+static void
+lightdm_user_list_set_property (GObject    *object,
+                                guint       prop_id,
+                                const GValue *value,
+                                GParamSpec *pspec)
+{
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+}
+
+static void
+lightdm_user_list_get_property (GObject    *object,
+                                guint       prop_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+    LightDMUserList *self;
+
+    self = LIGHTDM_USER_LIST (object);
+
+    switch (prop_id)
+    {
+    case LIST_PROP_NUM_USERS:
+        g_value_set_int (value, lightdm_user_list_get_length (self));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+static void
+lightdm_user_list_finalize (GObject *object)
+{
+    LightDMUserList *self = LIGHTDM_USER_LIST (object);
+    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (self);
+
+    g_list_free_full (priv->lightdm_list, g_object_unref);
+
+    G_OBJECT_CLASS (lightdm_user_list_parent_class)->finalize (object);
+}
+
+static void
+lightdm_user_list_class_init (LightDMUserListClass *klass)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+    g_type_class_add_private (klass, sizeof (LightDMUserListPrivate));
+
+    object_class->set_property = lightdm_user_list_set_property;
+    object_class->get_property = lightdm_user_list_get_property;
+    object_class->finalize = lightdm_user_list_finalize;
+
+    g_object_class_install_property (object_class,
+                                     LIST_PROP_NUM_USERS,
+                                     g_param_spec_int ("num-users",
+                                                       "num-users",
+                                                       "Number of login users",
+                                                       0, G_MAXINT, 0,
+                                                       G_PARAM_READABLE));
+    /**
+     * LightDMUserList::user-added:
+     * @user_list: A #LightDMUserList
+     * @user: The #LightDM user that has been added.
+     *
+     * The ::user-added signal gets emitted when a user account is created.
+     **/
+    list_signals[USER_ADDED] =
+        g_signal_new ("user-added",
+                      G_TYPE_FROM_CLASS (klass),
+                      G_SIGNAL_RUN_LAST,
+                      G_STRUCT_OFFSET (LightDMUserListClass, user_added),
+                      NULL, NULL,
+                      NULL,
+                      G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
+
+    /**
+     * LightDMUserList::user-changed:
+     * @user_list: A #LightDMUserList
+     * @user: The #LightDM user that has been changed.
+     *
+     * The ::user-changed signal gets emitted when a user account is modified.
+     **/
+    list_signals[USER_CHANGED] =
+        g_signal_new ("user-changed",
+                      G_TYPE_FROM_CLASS (klass),
+                      G_SIGNAL_RUN_LAST,
+                      G_STRUCT_OFFSET (LightDMUserListClass, user_changed),
+                      NULL, NULL,
+                      NULL,
+                      G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
+
+    /**
+     * LightDMUserList::user-removed:
+     * @user_list: A #LightDMUserList
+     * @user: The #LightDM user that has been removed.
+     *
+     * The ::user-removed signal gets emitted when a user account is removed.
+     **/
+    list_signals[USER_REMOVED] =
+        g_signal_new ("user-removed",
+                      G_TYPE_FROM_CLASS (klass),
+                      G_SIGNAL_RUN_LAST,
+                      G_STRUCT_OFFSET (LightDMUserListClass, user_removed),
+                      NULL, NULL,
+                      NULL,
+                      G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
+}
+
+/**
+ * lightdm_user_get_name:
+ * @user: A #LightDMUser
+ * 
+ * Get the name of a user.
+ * 
+ * Return value: The name of the given user
+ **/
+const gchar *
+lightdm_user_get_name (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    return common_user_get_name (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_real_name:
+ * @user: A #LightDMUser
+ * 
+ * Get the real name of a user.
+ *
+ * Return value: The real name of the given user
+ **/
+const gchar *
+lightdm_user_get_real_name (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    return common_user_get_real_name (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_display_name:
+ * @user: A #LightDMUser
+ * 
+ * Get the display name of a user.
+ * 
+ * Return value: The display name of the given user
+ **/
+const gchar *
+lightdm_user_get_display_name (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    return common_user_get_display_name (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_home_directory:
+ * @user: A #LightDMUser
+ * 
+ * Get the home directory for a user.
+ * 
+ * Return value: The users home directory
+ */
+const gchar *
+lightdm_user_get_home_directory (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    return common_user_get_home_directory (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_image:
+ * @user: A #LightDMUser
+ * 
+ * Get the image URI for a user.
+ * 
+ * Return value: The image URI for the given user or #NULL if no URI
+ **/
+const gchar *
+lightdm_user_get_image (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    return common_user_get_image (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_background:
+ * @user: A #LightDMUser
+ * 
+ * Get the background file path for a user.
+ * 
+ * Return value: The background file path for the given user or #NULL if no path
+ **/
+const gchar *
+lightdm_user_get_background (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    return common_user_get_background (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_language:
+ * @user: A #LightDMUser
+ * 
+ * Get the language for a user.
+ * 
+ * Return value: The language in the form of a local specification (e.g. "de_DE.UTF-8") for the given user or #NULL if using the system default locale.
+ **/
+const gchar *
+lightdm_user_get_language (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    return common_user_get_language (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_layout:
+ * @user: A #LightDMUser
+ * 
+ * Get the keyboard layout for a user.
+ * 
+ * Return value: The keyboard layout for the given user or #NULL if using system defaults.  Copy the value if you want to use it long term.
+ **/
+const gchar *
+lightdm_user_get_layout (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    return common_user_get_layout (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_layouts:
+ * @user: A #LightDMUser
+ * 
+ * Get the configured keyboard layouts for a user.
+ * 
+ * Return value: (transfer none): A NULL-terminated array of keyboard layouts for the given user.  Copy the values if you want to use them long term.
+ **/
+const gchar * const *
+lightdm_user_get_layouts (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    return common_user_get_layouts (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_session:
+ * @user: A #LightDMUser
+ * 
+ * Get the session for a user.
+ * 
+ * Return value: The session for the given user or #NULL if using system defaults.
+ **/
+const gchar *
+lightdm_user_get_session (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+    return common_user_get_session (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_logged_in:
+ * @user: A #LightDMUser
+ * 
+ * Check if a user is logged in.
+ * 
+ * Return value: #TRUE if the user is currently logged in.
+ **/
+gboolean
+lightdm_user_get_logged_in (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), FALSE);
+    return common_user_get_logged_in (GET_USER_PRIVATE (user)->common_user);
+}
+
+/**
+ * lightdm_user_get_has_messages:
+ * @user: A #LightDMUser
+ * 
+ * Check if a user has waiting messages.
+ * 
+ * Return value: #TRUE if the user has waiting messages.
+ **/
+gboolean
+lightdm_user_get_has_messages (LightDMUser *user)
+{
+    g_return_val_if_fail (LIGHTDM_IS_USER (user), FALSE);
+    return common_user_get_has_messages (GET_USER_PRIVATE (user)->common_user);
+}
+
+static void
+lightdm_user_init (LightDMUser *user)
+{
+}
+
+static void
+lightdm_user_set_property (GObject    *object,
+                           guint       prop_id,
+                           const GValue *value,
+                           GParamSpec *pspec)
+{
+    LightDMUser *self = LIGHTDM_USER (object);
+    LightDMUserPrivate *priv = GET_USER_PRIVATE (self);
+
+    switch (prop_id)
+    {
+    case USER_PROP_COMMON_USER:
+        priv->common_user = g_value_dup_object (value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+static void
+lightdm_user_get_property (GObject    *object,
+                           guint       prop_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+    LightDMUser *self;
+
+    self = LIGHTDM_USER (object);
+
+    switch (prop_id)
+    {
+    case USER_PROP_NAME:
+        g_value_set_string (value, lightdm_user_get_name (self));
+        break;
+    case USER_PROP_REAL_NAME:
+        g_value_set_string (value, lightdm_user_get_real_name (self));
+        break;
+    case USER_PROP_DISPLAY_NAME:
+        g_value_set_string (value, lightdm_user_get_display_name (self));
+        break;
+    case USER_PROP_HOME_DIRECTORY:
+        g_value_set_string (value, lightdm_user_get_home_directory (self));
+        break;
+    case USER_PROP_IMAGE:
+        g_value_set_string (value, lightdm_user_get_image (self));
+        break;
+    case USER_PROP_BACKGROUND:
+        g_value_set_string (value, lightdm_user_get_background (self));
+        break;
+    case USER_PROP_LANGUAGE:
+        g_value_set_string (value, lightdm_user_get_language (self));
+        break;
+    case USER_PROP_LAYOUT:
+        g_value_set_string (value, lightdm_user_get_layout (self));
+        break;
+    case USER_PROP_LAYOUTS:
+        g_value_set_boxed (value, g_strdupv ((gchar **) lightdm_user_get_layouts (self)));
+        break;
+    case USER_PROP_SESSION:
+        g_value_set_string (value, lightdm_user_get_session (self));
+        break;
+    case USER_PROP_LOGGED_IN:
+        g_value_set_boolean (value, lightdm_user_get_logged_in (self));
+        break;
+    case USER_PROP_HAS_MESSAGES:
+        g_value_set_boolean (value, lightdm_user_get_has_messages (self));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+static void
+lightdm_user_finalize (GObject *object)
+{
+    LightDMUser *self = LIGHTDM_USER (object);
+    LightDMUserPrivate *priv = GET_USER_PRIVATE (self);
+
+    g_object_unref (priv->common_user);
+
+    G_OBJECT_CLASS (lightdm_user_parent_class)->finalize (object);
+}
+
+static void
+lightdm_user_class_init (LightDMUserClass *klass)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  
+    g_type_class_add_private (klass, sizeof (LightDMUserPrivate));
+
+    object_class->set_property = lightdm_user_set_property;
+    object_class->get_property = lightdm_user_get_property;
+    object_class->finalize = lightdm_user_finalize;
+
+    g_object_class_install_property (object_class,
+                                     USER_PROP_COMMON_USER,
+                                     g_param_spec_object ("common-user",
+                                                          "common-user",
+                                                          "Internal user object",
+                                                          COMMON_TYPE_USER,
+                                                          G_PARAM_PRIVATE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_WRITABLE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_NAME,
+                                     g_param_spec_string ("name",
+                                                          "name",
+                                                          "Username",
+                                                          NULL,
+                                                          G_PARAM_READWRITE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_REAL_NAME,
+                                     g_param_spec_string ("real-name",
+                                                          "real-name",
+                                                          "Users real name",
+                                                          NULL,
+                                                          G_PARAM_READWRITE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_DISPLAY_NAME,
+                                     g_param_spec_string ("display-name",
+                                                          "display-name",
+                                                          "Users display name",
+                                                          NULL,
+                                                          G_PARAM_READABLE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_HOME_DIRECTORY,
+                                     g_param_spec_string ("home-directory",
+                                                          "home-directory",
+                                                          "Home directory",
+                                                          NULL,
+                                                          G_PARAM_READWRITE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_IMAGE,
+                                     g_param_spec_string ("image",
+                                                          "image",
+                                                          "Avatar image",
+                                                          NULL,
+                                                          G_PARAM_READWRITE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_BACKGROUND,
+                                     g_param_spec_string ("background",
+                                                          "background",
+                                                          "User background",
+                                                          NULL,
+                                                          G_PARAM_READWRITE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_LANGUAGE,
+                                     g_param_spec_string ("language",
+                                                         "language",
+                                                         "Language used by this user",
+                                                         NULL,
+                                                         G_PARAM_READABLE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_LAYOUT,
+                                     g_param_spec_string ("layout",
+                                                          "layout",
+                                                          "Keyboard layout used by this user",
+                                                          NULL,
+                                                          G_PARAM_READABLE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_LAYOUTS,
+                                     g_param_spec_boxed ("layouts",
+                                                         "layouts",
+                                                         "Keyboard layouts used by this user",
+                                                         G_TYPE_STRV,
+                                                         G_PARAM_READABLE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_SESSION,
+                                     g_param_spec_string ("session",
+                                                          "session",
+                                                          "Session used by this user",
+                                                          NULL,
+                                                          G_PARAM_READABLE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_LOGGED_IN,
+                                     g_param_spec_boolean ("logged-in",
+                                                           "logged-in",
+                                                           "TRUE if the user is currently in a session",
+                                                           FALSE,
+                                                           G_PARAM_READWRITE));
+    g_object_class_install_property (object_class,
+                                     USER_PROP_LOGGED_IN,
+                                     g_param_spec_boolean ("has-messages",
+                                                           "has-messages",
+                                                           "TRUE if the user is has waiting messages",
+                                                           FALSE,
+                                                           G_PARAM_READWRITE));
+
+    /**
+     * LightDMUser::changed:
+     * @user: A #LightDMUser
+     *
+     * The ::changed signal gets emitted this user account is modified.
+     **/
+    user_signals[CHANGED] =
+        g_signal_new ("changed",
+                      G_TYPE_FROM_CLASS (klass),
+                      G_SIGNAL_RUN_LAST,
+                      G_STRUCT_OFFSET (LightDMUserClass, changed),
+                      NULL, NULL,
+                      NULL,
+                      G_TYPE_NONE, 0);
+}

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-02-06 15:35:02 +0000
+++ src/Makefile.am	2014-02-08 22:36:44 +0000
@@ -4,16 +4,12 @@
 lightdm_SOURCES = \
 	accounts.c \
 	accounts.h \
-	configuration.c \
-	configuration.h \
 	console-kit.c \
 	console-kit.h \
 	display-manager.c \
 	display-manager.h \
 	display-server.c \
 	display-server.h \
-	dmrc.c \
-	dmrc.h \
 	greeter.c \
 	greeter.h \
 	guest-account.c \
@@ -27,8 +23,6 @@
 	mir-server.h \
 	plymouth.c \
 	plymouth.h \
-	privileges.c \
-	privileges.h \
 	process.c \
 	process.h \
 	seat.c \
@@ -80,6 +74,7 @@
 lightdm_CFLAGS = \
 	$(WARN_CFLAGS) \
 	$(LIGHTDM_CFLAGS) \
+	-I"$(top_srcdir)/common" \
 	-DSBIN_DIR=\"$(sbindir)\" \
 	-DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \
 	-DLOG_DIR=\"$(localstatedir)/log/lightdm\" \
@@ -92,6 +87,7 @@
 
 lightdm_LDADD = \
 	$(LIGHTDM_LIBS) \
+	$(top_builddir)/common/libcommon.la \
 	-lgcrypt \
 	-lpam
 

=== modified file 'src/accounts.c'
--- src/accounts.c	2013-06-17 23:14:43 +0000
+++ src/accounts.c	2014-02-08 22:36:44 +0000
@@ -10,273 +10,34 @@
  * license.
  */
 
-#include <errno.h>
 #include <pwd.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "accounts.h"
-#include "dmrc.h"
+#include "user-list.h"
 
 struct UserPrivate
 {
-    /* Name of user */
-    gchar *name;
-
-    /* Accounts interface proxy */
-    GDBusProxy *proxy;
-
-    /* User ID */
-    uid_t uid;
-
-    /* Group ID */
-    gid_t gid;
-
-    /* GECOS information */
-    gchar *gecos;
-
-    /* Home directory */
-    gchar *home_directory;
-
-    /* Shell */
-    gchar *shell;
-
-    /* Language */
-    gchar *language;
-
-    /* X session */
-    gchar *xsession;
+    /* Internal user object */
+    CommonUser *common_user;
 };
 
 G_DEFINE_TYPE (User, user, G_TYPE_OBJECT);
 
-/* Connection to AccountsService */
-static GDBusProxy *accounts_service_proxy = NULL;
-static gboolean have_accounts_service_proxy = FALSE;
-
-static gboolean
-call_method (GDBusProxy *proxy, const gchar *method, GVariant *args,
-             const gchar *expected, GVariant **result)
-{
-    GVariant *answer;
-    GError *error = NULL;
-
-    if (!proxy)
-        return FALSE;
-
-    answer = g_dbus_proxy_call_sync (proxy,
-                                     method,
-                                     args,
-                                     G_DBUS_CALL_FLAGS_NONE,
-                                     -1,
-                                     NULL,
-                                     &error);
-    if (error)
-        g_warning ("Could not call %s: %s", method, error->message);
-    g_clear_error (&error);
-
-    if (!answer)
-        return FALSE;
-
-    if (!g_variant_is_of_type (answer, G_VARIANT_TYPE (expected)))
-    {
-        g_warning ("Unexpected response from %s: %s",
-                   method, g_variant_get_type_string (answer));
-        g_variant_unref (answer);
-        return FALSE;
-    }
-
-    if (result)
-        *result = answer;
-    else
-        g_variant_unref (answer);
-
-    return TRUE;
-}
-
-static gboolean
-get_property (GDBusProxy *proxy, const gchar *property,
-              const gchar *expected, GVariant **result)
-{
-    GVariant *answer;
-
-    answer = g_dbus_proxy_get_cached_property (proxy, property);
-
-    if (!answer)
-    {
-        g_warning ("Could not get accounts property %s", property);
-        return FALSE;
-    }
-
-    if (!g_variant_is_of_type (answer, G_VARIANT_TYPE (expected)))
-    {
-        g_warning ("Unexpected accounts property type for %s: %s",
-                   property, g_variant_get_type_string (answer));
-        g_variant_unref (answer);
-        return FALSE;
-    }
-
-    if (result)
-        *result = answer;
-    else
-        g_variant_unref (answer);
-    return TRUE;
-}
-
-static void
-save_string_to_dmrc (const gchar *username, const gchar *group,
-                     const gchar *key, const gchar *value)
-{
-    GKeyFile *dmrc;
-
-    dmrc = dmrc_load (username);
-    g_key_file_set_string (dmrc, group, key, value);
-    dmrc_save (dmrc, username);
-
-    g_key_file_free (dmrc);
-}
-
-static gchar *
-get_string_from_dmrc (const gchar *username, const gchar *group,
-                      const gchar *key)
-{
-    GKeyFile *dmrc;
-    gchar *value;
-
-    dmrc = dmrc_load (username);
-    value = g_key_file_get_string (dmrc, group, key, NULL);
-
-    g_key_file_free (dmrc);
-    return value;
-}
-
-static GDBusProxy *
-get_accounts_service_proxy (void)
-{
-    GError *error = NULL;
-
-    if (have_accounts_service_proxy)
-        return accounts_service_proxy;
-
-    have_accounts_service_proxy = TRUE;
-    accounts_service_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-                                                            G_DBUS_PROXY_FLAGS_NONE,
-                                                            NULL,
-                                                            "org.freedesktop.Accounts",
-                                                            "/org/freedesktop/Accounts",
-                                                            "org.freedesktop.Accounts",
-                                                            NULL, &error);
-    if (error)
-        g_warning ("Could not get accounts proxy: %s", error->message);
-    g_clear_error (&error);
-
-    if (accounts_service_proxy)
-    {
-        gchar *name;
-        name = g_dbus_proxy_get_name_owner (accounts_service_proxy);
-        if (!name)
-        {
-            g_debug ("org.freedesktop.Accounts does not exist, falling back to passwd file");
-            g_object_unref (accounts_service_proxy);
-            accounts_service_proxy = NULL;
-        }
-        g_free (name);
-    }  
-
-    return accounts_service_proxy;
-}
-
-static GDBusProxy *
-get_accounts_proxy_for_user (const gchar *user)
-{
-    GDBusProxy *proxy;
-    GError *error = NULL;
-    GVariant *result;
-    gboolean success;
-    gchar *user_path = NULL;
-
-    g_return_val_if_fail (user != NULL, NULL);  
-
-    proxy = get_accounts_service_proxy ();
-    if (!proxy)
-        return NULL;
-
-    success = call_method (proxy, "FindUserByName", g_variant_new ("(s)", user), "(o)", &result);
-
-    if (!success)
-        return NULL;
-
-    g_variant_get (result, "(o)", &user_path);
-    g_variant_unref (result);
-
-    if (!user_path)
-        return NULL;
-  
-    proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-                                           G_DBUS_PROXY_FLAGS_NONE,
-                                           NULL,
-                                           "org.freedesktop.Accounts",
-                                           user_path,
-                                           "org.freedesktop.Accounts.User",
-                                           NULL, &error);
-    if (error)
-        g_warning ("Could not get accounts user proxy: %s", error->message);
-    g_clear_error (&error);
-    g_free (user_path);
-
-    return proxy;
-}
-
-static User *
-user_from_passwd (struct passwd *user_info)
-{
-    User *user;
-
-    user = g_object_new (USER_TYPE, NULL);
-    user->priv->name = g_strdup (user_info->pw_name);
-    user->priv->uid = user_info->pw_uid;
-    user->priv->gid = user_info->pw_gid;
-    user->priv->gecos = g_strdup (user_info->pw_gecos);
-    user->priv->home_directory = g_strdup (user_info->pw_dir);
-    user->priv->shell = g_strdup (user_info->pw_shell);
-    user->priv->proxy = get_accounts_proxy_for_user (user->priv->name);
-
-    return user;
-}
-
 User *
 accounts_get_user_by_name (const gchar *username)
 {
-    struct passwd *user_info;
     User *user = NULL;
+    CommonUser *common_user;
 
     g_return_val_if_fail (username != NULL, NULL);
 
-    errno = 0;
-    user_info = getpwnam (username);
-    if (user_info)
-        user = user_from_passwd (user_info);
-
-    if (!user && errno != 0)
-        g_warning ("Unable to get information on user %s: %s", username, strerror (errno));
-
-    return user;
-}
-
-User *
-accounts_get_user_by_uid (uid_t uid)
-{
-    User *user = NULL;
-
-    errno = 0;
-    struct passwd *user_info;
-
-    user_info = getpwuid (uid);
-    if (user_info)
-        user = user_from_passwd (user_info);
-
-    if (!user && errno != 0)
-        g_warning ("Unable to get information on user %d: %s", uid, strerror (errno));
+    common_user = common_user_list_get_user_by_name (common_user_list_get_instance (), username);
+    if (common_user != NULL)
+    {
+        user = g_object_new (USER_TYPE, NULL);
+        user->priv->common_user = common_user;
+    }
 
     return user;
 }
@@ -284,136 +45,74 @@
 User *
 accounts_get_current_user ()
 {
-    return user_from_passwd (getpwuid (getuid ()));
+    struct passwd *entry = getpwuid (getuid ());
+    if (entry != NULL)
+        return accounts_get_user_by_name (entry->pw_name);
+    else
+        return NULL;
 }
 
 const gchar *
 user_get_name (User *user)
 {
     g_return_val_if_fail (user != NULL, NULL);
-    return user->priv->name;
+    return common_user_get_name (user->priv->common_user);
 }
 
 uid_t
 user_get_uid (User *user)
 {
     g_return_val_if_fail (user != NULL, 0);
-    return user->priv->uid;
+    return common_user_get_uid (user->priv->common_user);
 }
 
 gid_t
 user_get_gid (User *user)
 {
     g_return_val_if_fail (user != NULL, 0);
-    return user->priv->gid;
-}
-
-const gchar *
-user_get_gecos (User *user)
-{
-    g_return_val_if_fail (user != NULL, NULL);
-    return user->priv->gecos;
+    return common_user_get_gid (user->priv->common_user);
 }
 
 const gchar *
 user_get_home_directory (User *user)
 {
     g_return_val_if_fail (user != NULL, NULL);
-    return user->priv->home_directory;
+    return common_user_get_home_directory (user->priv->common_user);
 }
 
 const gchar *
 user_get_shell (User *user)
 {
     g_return_val_if_fail (user != NULL, NULL);
-    return user->priv->shell;
+    return common_user_get_shell (user->priv->common_user);
 }
 
 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);
+    common_user_set_language (user->priv->common_user, 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)
-    {
-        /* 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
-        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;
+    return common_user_get_language (user->priv->common_user);
 }
 
 void
 user_set_xsession (User *user, const gchar *xsession)
 {
     g_return_if_fail (user != NULL);
-
-    call_method (user->priv->proxy, "SetXSession", g_variant_new ("(s)", xsession), "()", NULL);
-    save_string_to_dmrc (user->priv->name, "Desktop", "Session", xsession);
+    common_user_set_session (user->priv->common_user, xsession);
 }
 
 const gchar *
 user_get_xsession (User *user)
 {
-    GVariant *result;
-
     g_return_val_if_fail (user != NULL, NULL);
-
-    g_free (user->priv->xsession);
-    if (user->priv->proxy)
-    {
-        if (get_property (user->priv->proxy, "XSession", "s", &result))
-        {
-            g_variant_get (result, "s", &user->priv->xsession);
-            g_variant_unref (result);
-        }
-        else
-            user->priv->xsession = NULL;
-    }
-    else
-        user->priv->xsession = get_string_from_dmrc (user->priv->name, "Desktop", "Session");
-
-    if (g_strcmp0 (user->priv->xsession, "") == 0)
-    {
-        g_free (user->priv->xsession);
-        user->priv->xsession = NULL;
-    }
-
-    return user->priv->xsession;
+    return common_user_get_session (user->priv->common_user);
 }
 
 static void
@@ -429,38 +128,19 @@
 
     self = USER (object);
 
-    if (self->priv->proxy)
-    {
-        g_object_unref (self->priv->proxy);
-        self->priv->proxy = NULL;
-    }
+    if (self->priv->common_user)
+        g_object_unref (self->priv->common_user);
+    self->priv->common_user = NULL;
 
     G_OBJECT_CLASS (user_parent_class)->dispose (object);
 }
 
 static void
-user_finalize (GObject *object)
-{
-    User *self;
-
-    self = USER (object);
-
-    g_free (self->priv->name);
-    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);  
-}
-
-static void
 user_class_init (UserClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
     object_class->dispose = user_dispose;
-    object_class->finalize = user_finalize;  
 
     g_type_class_add_private (klass, sizeof (UserPrivate));
 }

=== modified file 'src/accounts.h'
--- src/accounts.h	2013-04-24 01:51:02 +0000
+++ src/accounts.h	2014-02-08 22:36:44 +0000
@@ -36,8 +36,6 @@
 
 User *accounts_get_user_by_name (const gchar *username);
 
-User *accounts_get_user_by_uid (uid_t uid);
-
 User *accounts_get_current_user (void);
 
 GType user_get_type (void);
@@ -48,8 +46,6 @@
 
 gid_t user_get_gid (User *user);
 
-const gchar *user_get_gecos (User *user);
-
 const gchar *user_get_home_directory (User *user);
 
 const gchar *user_get_shell (User *user);

=== modified file 'src/lightdm.c'
--- src/lightdm.c	2013-11-25 21:40:16 +0000
+++ src/lightdm.c	2014-02-08 22:36:44 +0000
@@ -30,6 +30,7 @@
 #include "x-server.h"
 #include "process.h"
 #include "session-child.h"
+#include "user-list.h"
 
 static gchar *config_path = NULL;
 static GMainLoop *loop = NULL;
@@ -42,7 +43,7 @@
 static VNCServer *vnc_server = NULL;
 static guint bus_id = 0;
 static GDBusConnection *bus = NULL;
-static guint bus_id;
+static guint reg_id = 0;
 static GDBusNodeInfo *seat_info;
 static GHashTable *seat_bus_entries = NULL;
 static guint seat_index = 0;
@@ -787,13 +788,13 @@
     session_info = g_dbus_node_info_new_for_xml (session_interface, NULL);
     g_assert (session_info != NULL);
 
-    bus_id = g_dbus_connection_register_object (connection,
+    reg_id = g_dbus_connection_register_object (connection,
                                                 "/org/freedesktop/DisplayManager",
                                                 display_manager_info->interfaces[0],
                                                 &display_manager_vtable,
                                                 NULL, NULL,
                                                 &error);
-    if (bus_id == 0)
+    if (reg_id == 0)
         g_warning ("Failed to register display manager: %s", error->message);
     g_clear_error (&error);
     g_dbus_node_info_unref (display_manager_info);
@@ -1319,11 +1320,15 @@
 
     g_main_loop_run (loop);
 
+    /* Clean up user list */
+    common_user_list_cleanup ();
+
     /* Clean up display manager */
     g_object_unref (display_manager);
     display_manager = NULL;
 
     /* Remove D-Bus interface */
+    g_dbus_connection_unregister_object (bus, reg_id);
     g_bus_unown_name (bus_id);
     if (seat_bus_entries)
         g_hash_table_unref (seat_bus_entries);

=== modified file 'src/session-child.c'
--- src/session-child.c	2014-02-06 15:04:11 +0000
+++ src/session-child.c	2014-02-08 22:36:44 +0000
@@ -512,7 +512,7 @@
 
         drop_privileges = geteuid () == 0;
         if (drop_privileges)
-            privileges_drop (user);
+            privileges_drop (user_get_uid (user), user_get_gid (user));
         result = x_authority_write (x_authority, XAUTH_WRITE_MODE_REPLACE, x_authority_filename, &error);
         if (drop_privileges)
             privileges_reclaim ();
@@ -660,7 +660,7 @@
 
         drop_privileges = geteuid () == 0;
         if (drop_privileges)
-            privileges_drop (user);
+            privileges_drop (user_get_uid (user), user_get_gid (user));
         result = x_authority_write (x_authority, XAUTH_WRITE_MODE_REMOVE, x_authority_filename, &error);
         if (drop_privileges)
             privileges_reclaim ();

=== modified file 'tests/src/test-gobject-greeter.c'
--- tests/src/test-gobject-greeter.c	2013-10-30 17:30:12 +0000
+++ tests/src/test-gobject-greeter.c	2014-02-08 22:36:44 +0000
@@ -218,7 +218,7 @@
     if (strcmp (name, "LOG-USER") == 0)
     {
         LightDMUser *user;
-        const gchar *username, *image, *background, *layout, *session;
+        const gchar *username, *image, *background, *language, *layout, *session;
         const gchar * const * layouts;
         gchar **fields = NULL;
         gchar *layouts_text;
@@ -237,6 +237,7 @@
         user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username);
         image = lightdm_user_get_image (user);
         background = lightdm_user_get_background (user);
+        language = lightdm_user_get_language (user);
         layout = lightdm_user_get_layout (user);
         layouts = lightdm_user_get_layouts (user);
         layouts_text = g_strjoinv (";", (gchar **) layouts);
@@ -255,7 +256,7 @@
             else if (strcmp (fields[i], "BACKGROUND") == 0)
                 g_string_append_printf (status_text, " BACKGROUND=%s", background ? background : "");
             else if (strcmp (fields[i], "LANGUAGE") == 0)
-                g_string_append_printf (status_text, " LANGUAGE=%s", lightdm_user_get_language (user));
+                g_string_append_printf (status_text, " LANGUAGE=%s", language ? language : "");
             else if (strcmp (fields[i], "LAYOUT") == 0)
                 g_string_append_printf (status_text, " LAYOUT=%s", layout ? layout : "");
             else if (strcmp (fields[i], "LAYOUTS") == 0)

=== modified file 'tests/src/test-runner.c'
--- tests/src/test-runner.c	2013-11-07 00:37:07 +0000
+++ tests/src/test-runner.c	2014-02-08 22:36:44 +0000
@@ -1715,6 +1715,15 @@
         user->xsession = g_strdup (xsession);
 
         g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+
+        /* And notify others that it took */
+        g_dbus_connection_emit_signal (accounts_connection,
+                                       NULL,
+                                       user->path,
+                                       "org.freedesktop.Accounts.User",
+                                       "Changed",
+                                       g_variant_new ("()"),
+                                       NULL);
     }
     else
         g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name);
@@ -1745,6 +1754,10 @@
         return g_variant_new_string (user->language ? user->language : "");
     else if (strcmp (property_name, "IconFile") == 0)
         return g_variant_new_string (user->image ? user->image : "");
+    else if (strcmp (property_name, "Shell") == 0)
+        return g_variant_new_string ("/bin/sh");
+    else if (strcmp (property_name, "Uid") == 0)
+        return g_variant_new_uint64 (user->uid);
     else if (strcmp (property_name, "XSession") == 0)
         return g_variant_new_string (user->xsession ? user->xsession : "");
     else if (strcmp (property_name, "XKeyboardLayouts") == 0)
@@ -1800,6 +1813,8 @@
         "    <property name='BackgroundFile' type='s' access='read'/>"
         "    <property name='Language' type='s' access='read'/>"
         "    <property name='IconFile' type='s' access='read'/>"
+        "    <property name='Shell' type='s' access='read'/>"
+        "    <property name='Uid' type='t' access='read'/>"
         "    <property name='XSession' type='s' access='read'/>"
         "    <property name='XKeyboardLayouts' type='as' access='read'/>"
         "    <property name='XHasMessages' type='b' access='read'/>"