Merge lp:~mterry/lightdm/background-file into lp:lightdm

[Michael Terry]

This branch adds support for grabbing background information from accountsservice (which does not yet support publishing that info, but I have a branch for that ready to go).

=== modified file 'liblightdm-gobject/lightdm/user.h'
--- liblightdm-gobject/lightdm/user.h	2011-07-22 02:55:15 +0000
+++ liblightdm-gobject/lightdm/user.h	2011-12-07 16:54:25 +0000
@@ -93,6 +93,8 @@
 
 const gchar *lightdm_user_get_image (LightDMUser *user);
 
+const gchar *lightdm_user_get_background (LightDMUser *user);
+
 const gchar *lightdm_user_get_language (LightDMUser *user);
 
 const gchar *lightdm_user_get_layout (LightDMUser *user);

=== modified file 'liblightdm-gobject/user.c'
--- liblightdm-gobject/user.c	2011-10-07 22:41:42 +0000
+++ liblightdm-gobject/user.c	2011-12-07 16:54:25 +0000
@@ -34,6 +34,7 @@
     USER_PROP_DISPLAY_NAME,
     USER_PROP_HOME_DIRECTORY,
     USER_PROP_IMAGE,
+    USER_PROP_BACKGROUND,
     USER_PROP_LANGUAGE,
     USER_PROP_LAYOUT,
     USER_PROP_SESSION,
@@ -92,6 +93,7 @@
     gchar *real_name;
     gchar *home_directory;
     gchar *image;
+    gchar *background;
 
     GKeyFile *dmrc_file;
     gchar *language;
@@ -433,6 +435,16 @@
             else
                 priv->image = g_strdup (icon_file);
         }
+        else if (strcmp (name, "BackgroundFile") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
+        {
+            gchar *background_file;
+            g_variant_get (value, "&s", &background_file);
+            g_free (priv->background);
+            if (strcmp (background_file, "") == 0)
+                priv->background = NULL;
+            else
+                priv->background = g_strdup (background_file);
+        }
     }
     g_variant_iter_free (iter);
 
@@ -1081,6 +1093,21 @@
     return GET_USER_PRIVATE (user)->image;
 }
 
+/**
+ * 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 GET_USER_PRIVATE (user)->background;
+}
+
 static void
 load_dmrc (LightDMUser *user)
 {
@@ -1274,6 +1301,7 @@
     priv->real_name = g_strdup ("");
     priv->home_directory = g_strdup ("");
     priv->image = g_strdup ("");
+    priv->background = g_strdup ("");
     priv->language = g_strdup ("");
     priv->layout = g_strdup ("");
     priv->session = g_strdup ("");
@@ -1315,6 +1343,9 @@
     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;
@@ -1343,6 +1374,7 @@
     g_free (priv->real_name);
     g_free (priv->home_directory);
     g_free (priv->image);
+    g_free (priv->background);
     if (priv->dmrc_file)
         g_key_file_free (priv->dmrc_file);
 }
@@ -1394,6 +1426,13 @@
                                                           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",

=== modified file 'liblightdm-qt/QLightDM/usersmodel.h'
--- liblightdm-qt/QLightDM/usersmodel.h	2011-11-26 12:40:52 +0000
+++ liblightdm-qt/QLightDM/usersmodel.h	2011-12-07 16:54:25 +0000
@@ -30,7 +30,8 @@
 
     enum UserModelRoles {NameRole = Qt::UserRole,
                          RealNameRole,
-                         LoggedInRole};
+                         LoggedInRole,
+                         BackgroundRole};
 
     int rowCount(const QModelIndex &parent) const;
     QVariant data(const QModelIndex &index, int role) const;

=== modified file 'liblightdm-qt/usersmodel.cpp'
--- liblightdm-qt/usersmodel.cpp	2011-11-28 13:57:49 +0000
+++ liblightdm-qt/usersmodel.cpp	2011-12-07 16:54:25 +0000
@@ -26,6 +26,7 @@
     QString realName;
     QString homeDirectory;
     QString image;
+    QString background;
     bool isLoggedIn;
     QString displayName() const;
 };
@@ -91,6 +92,7 @@
             user.homeDirectory = QString::fromLocal8Bit(lightdm_user_get_home_directory(ldmUser));
             user.realName = QString::fromLocal8Bit(lightdm_user_get_real_name(ldmUser));
             user.image = QString::fromLocal8Bit(lightdm_user_get_image(ldmUser));
+            user.background = QString::fromLocal8Bit(lightdm_user_get_background(ldmUser));
             user.isLoggedIn = lightdm_user_get_logged_in(ldmUser);
             users.append(user);
         }
@@ -116,6 +118,7 @@
     user.homeDirectory = QString::fromLocal8Bit(lightdm_user_get_home_directory(ldmUser));
     user.realName = QString::fromLocal8Bit(lightdm_user_get_real_name(ldmUser));
     user.image = QString::fromLocal8Bit(lightdm_user_get_image(ldmUser));
+    user.background = QString::fromLocal8Bit(lightdm_user_get_background(ldmUser));
     user.isLoggedIn = lightdm_user_get_logged_in(ldmUser);
     that->users.append(user);
 
@@ -136,6 +139,7 @@
             that->users[i].homeDirectory = QString::fromLocal8Bit(lightdm_user_get_home_directory(ldmUser));
             that->users[i].realName = QString::fromLocal8Bit(lightdm_user_get_real_name(ldmUser));
             that->users[i].image = QString::fromLocal8Bit(lightdm_user_get_image(ldmUser));
+            that->users[i].background = QString::fromLocal8Bit(lightdm_user_get_background(ldmUser));
             that->users[i].isLoggedIn = lightdm_user_get_logged_in(ldmUser);
 
             QModelIndex index = that->q_ptr->createIndex(i, 0);
@@ -209,6 +213,8 @@
         return d->users[row].realName;
     case UsersModel::LoggedInRole:
         return d->users[row].isLoggedIn;
+    case UsersModel::BackgroundRole:
+        return QPixmap(d->users[row].background);
     }
 
     return QVariant();