Merge lp:~mterry/unity8/greeter-wallpaper into lp:unity8

[Michael Terry]

Have the greeter use AccountsService to determine its background.

Have the greeter use AccountsService to determine its background.

See the design: https://wiki.ubuntu.com/Appearance#Phone

Note that the user can have separate backgrounds for the greeter and the session. The session uses gsettings, and the greeter uses AccountsService. This is also what the greeter uses on the desktop (although there, the session makes sure that the two values are in sync rather than allowing them to be different).

Along the way, I cleaned up the AccountsService plugin to be more Qml-like. Bindable properties with change notifications for the properties we care about.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/unity8-ci/836/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/837
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/837/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/836
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2815
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2815/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2385
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/410
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/379

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/836/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

554 + Q_INVOKABLE void setUser(const QString &user);

Why not make this a property too?

review: Needs Information

[Michael Terry (mterry)]

No reason. I was just thinking that since I only needed a set, not a get/notify, a method would do. And I don't (yet!) dream in Qml so it didn't feel weird to me. :)

I've made it a property in latest revision.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:275
http://jenkins.qa.ubuntu.com/job/unity8-ci/873/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/508
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1479/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/874
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/874/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/873
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2947
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2947/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2504
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/510
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/510/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/464

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/873/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

518 +void AccountsBindings::setUser(const QString &)
519 +{
520 +}

527 +void AccountsBindings::setDemoEdges(bool)
528 +{
529 +}

Please use Q_UNUSED to get rid of the compiler warnings.

review: Needs Fixing

[Michael Terry (mterry)]

> Please use Q_UNUSED to get rid of the compiler warnings.

Done

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:277
http://jenkins.qa.ubuntu.com/job/unity8-ci/890/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3002/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/566/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1511
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/891/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/890/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3008/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/568/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/890/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

tbh I really don't like the naming of the classes...

imho AccountsBindings should still be AccountsService and the current AccountsService should be AccountsServiceDBusAdaptor or something like that.

but maybe its just me... what do you think?

review: Needs Information

[Michael Terry (mterry)]

Well, note that from Qml, it still is exposed as AccountsService.

But I figured the AccountsService class was more "accurate" to the DBus service. So it should get the name. While the class that bridged the gap between the service and Qml should be called Bindings.

But I don't care much. I'm happy to rename.

[Michael Terry (mterry)]

Renamed!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:279
http://jenkins.qa.ubuntu.com/job/unity8-ci/920/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3075/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/636/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1558
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/921
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/921/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/920
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3081
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3081/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/638
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/638/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/920/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/392/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2041
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1581
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/391
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/392
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3123
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2614
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/680
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/680/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/554
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/565

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Re-approving to get a clean run after today's jenkins issues.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/398/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/690
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/397
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/397/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3135
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2626
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/692
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/692/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/576

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/402/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/2058/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3133/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/694/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/401/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/402
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3139
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3139/artifact/work/output/*zip*/output.zip
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2630/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/696/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/408/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2064
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1597
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/407
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3145
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3145/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2636
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/702
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/702/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/585

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Components/EdgeDemo.qml'
--- Components/EdgeDemo.qml	2013-09-03 14:09:28 +0000
+++ Components/EdgeDemo.qml	2013-09-05 18:10:06 +0000
@@ -44,13 +44,13 @@
 
     function hideEdgeDemoInShell() {
         var user = LightDM.Users.data(greeter.currentIndex, LightDM.UserRoles.NameRole);
-        AccountsService.setUserProperty(user, "demo-edges", false);
+        AccountsService.demoEdges = false;
         d.showEdgeDemo = false;
         stopDemo();
     }
 
     function hideEdgeDemoInGreeter() {
-        // TODO: AccountsService.setUserProperty("lightdm", "demo-edges", false);
+        // TODO: AccountsService.demoEdges = false as lightdm user
         d.showEdgeDemoInGreeter = false;
     }
 
@@ -80,7 +80,7 @@
         property QtObject leftEdgeDemo
         property QtObject finalEdgeDemo
         property bool showEdgeDemo: false
-        property bool showEdgeDemoInGreeter: d.showEdgeDemo // TODO: AccountsService.getUserProperty("lightdm", "demo-edges")
+        property bool showEdgeDemoInGreeter: d.showEdgeDemo // TODO: AccountsService.demoEdges as lightdm user
 
         onShowEdgeDemoInGreeterChanged: {
             if (!d.overlay && d.showEdgeDemoInGreeter) {
@@ -126,7 +126,7 @@
 
         onSelected: {
             var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole)
-            d.showEdgeDemo = AccountsService.getUserProperty(user, "demo-edges")
+            d.showEdgeDemo = AccountsService.demoEdges
         }
     }
 

=== modified file 'Greeter/GreeterContent.qml'
--- Greeter/GreeterContent.qml	2013-08-28 20:50:37 +0000
+++ Greeter/GreeterContent.qml	2013-09-05 18:10:06 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import AccountsService 0.1
 import Ubuntu.Components 0.1
 import LightDM 0.1 as LightDM
 import "../Components"
@@ -39,14 +40,30 @@
         color: "black"
     }
 
+    property url backgroundValue: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : shell.defaultBackground
+    onBackgroundValueChanged: wallpaper.source = backgroundValue
+
     CrossFadeImage {
         id: wallpaper
-
-        source: shell.background
         anchors.fill: parent
         fadeInFirst: false
     }
 
+    // See Shell.qml's backgroundSettings treatment for why we need a separate
+    // Image, but it boils down to avoiding binding loop detection.
+    Image {
+        source: wallpaper.source
+        height: 0
+        width: 0
+        sourceSize.height: 0
+        sourceSize.width: 0
+        onStatusChanged: {
+            if (status == Image.Error && source != shell.defaultBackground) {
+                wallpaper.source = shell.defaultBackground
+            }
+        }
+    }
+
     Rectangle {
         anchors.fill: parent
         color: "black"

=== modified file 'Shell.qml'
--- Shell.qml	2013-09-04 20:40:11 +0000
+++ Shell.qml	2013-09-05 18:10:06 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import AccountsService 0.1
 import GSettings 1.0
 import Ubuntu.Application 0.1
 import Ubuntu.Components 0.1
@@ -478,6 +479,7 @@
         onSelected: {
             // Update launcher items for new user
             var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
+            AccountsService.user = user;
             LauncherModel.setUser(user);
         }
 

=== added file 'plugins/AccountsService/AccountsService.cpp'
--- plugins/AccountsService/AccountsService.cpp	1970-01-01 00:00:00 +0000
+++ plugins/AccountsService/AccountsService.cpp	2013-09-05 18:10:06 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "AccountsService.h"
+#include "AccountsServiceDBusAdaptor.h"
+
+#include <QStringList>
+
+AccountsService::AccountsService(QObject* parent)
+  : QObject(parent),
+    m_service(new AccountsServiceDBusAdaptor(this)),
+    m_user(qgetenv("USER"))
+{
+    connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
+            this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
+    connect(m_service, SIGNAL(maybeChanged(const QString &)),
+            this, SLOT(maybeChanged(const QString &)));
+}
+
+QString AccountsService::getUser()
+{
+    return m_user;
+}
+
+void AccountsService::setUser(const QString &user)
+{
+    m_user = user;
+    Q_EMIT userChanged();
+
+    updateDemoEdges();
+    updateBackgroundFile();
+}
+
+bool AccountsService::getDemoEdges()
+{
+    return m_demoEdges;
+}
+
+void AccountsService::setDemoEdges(bool demoEdges)
+{
+    m_demoEdges = demoEdges;
+    m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
+}
+
+QString AccountsService::getBackgroundFile()
+{
+    return m_backgroundFile;
+}
+
+void AccountsService::updateDemoEdges()
+{
+    auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
+    if (m_demoEdges != demoEdges) {
+        m_demoEdges = demoEdges;
+        Q_EMIT demoEdgesChanged();
+    }
+}
+
+void AccountsService::updateBackgroundFile()
+{
+    auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
+    if (m_backgroundFile != backgroundFile) {
+        m_backgroundFile = backgroundFile;
+        Q_EMIT backgroundFileChanged();
+    }
+}
+
+void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
+{
+    if (m_user != user) {
+        return;
+    }
+
+    if (interface == "com.canonical.unity.AccountsService") {
+        if (changed.contains("demo-edges")) {
+            updateDemoEdges();
+        }
+    }
+}
+
+void AccountsService::maybeChanged(const QString &user)
+{
+    if (m_user != user) {
+        return;
+    }
+
+    // Standard properties might have changed
+    updateBackgroundFile();
+}

=== added file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	1970-01-01 00:00:00 +0000
+++ plugins/AccountsService/AccountsService.h	2013-09-05 18:10:06 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Terry <[e-mail]>
+ */
+
+#ifndef UNITY_ACCOUNTSSERVICE_H
+#define UNITY_ACCOUNTSSERVICE_H
+
+#include <QObject>
+#include <QString>
+
+class AccountsServiceDBusAdaptor;
+
+class AccountsService: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY (QString user
+                READ getUser
+                WRITE setUser
+                NOTIFY userChanged)
+    Q_PROPERTY (bool demoEdges
+                READ getDemoEdges
+                WRITE setDemoEdges
+                NOTIFY demoEdgesChanged)
+    Q_PROPERTY (QString backgroundFile
+                READ getBackgroundFile
+                NOTIFY backgroundFileChanged)
+
+public:
+    explicit AccountsService(QObject *parent = 0);
+
+    QString getUser();
+    void setUser(const QString &user);
+    bool getDemoEdges();
+    void setDemoEdges(bool demoEdges);
+    QString getBackgroundFile();
+
+Q_SIGNALS:
+    void userChanged();
+    void demoEdgesChanged();
+    void backgroundFileChanged();
+
+private Q_SLOTS:
+    void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
+    void maybeChanged(const QString &user);
+
+private:
+    void updateDemoEdges();
+    void updateBackgroundFile();
+
+    AccountsServiceDBusAdaptor *m_service;
+    QString m_user;
+    bool m_demoEdges;
+    QString m_backgroundFile;
+};
+
+#endif

=== renamed file 'plugins/AccountsService/AccountsService.cpp' => 'plugins/AccountsService/AccountsServiceDBusAdaptor.cpp'
--- plugins/AccountsService/AccountsService.cpp	2013-08-22 14:54:08 +0000
+++ plugins/AccountsService/AccountsServiceDBusAdaptor.cpp	2013-09-05 18:10:06 +0000
@@ -16,13 +16,13 @@
  * Author: Michael Terry <[e-mail]>
  */
 
-#include "AccountsService.h"
+#include "AccountsServiceDBusAdaptor.h"
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
 #include <QDBusMessage>
 #include <QDBusVariant>
 
-AccountsService::AccountsService(QObject* parent)
+AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)
   : QObject(parent),
     accounts_manager(NULL),
     users()
@@ -36,11 +36,11 @@
                                           connection, this);
 }
 
-QVariant AccountsService::getUserProperty(const QString &user, const QString &property)
+QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const QString &interface, const QString &property)
 {
     auto iface = getUserInterface(user);
     if (iface != nullptr && iface->isValid()) {
-        auto answer = iface->call("Get", "com.canonical.unity.AccountsService", property);
+        auto answer = iface->call("Get", interface, property);
         if (answer.type() == QDBusMessage::ReplyMessage) {
             return answer.arguments()[0].value<QDBusVariant>().variant();
         }
@@ -48,25 +48,77 @@
     return QVariant();
 }
 
-void AccountsService::setUserProperty(const QString &user, const QString &property, const QVariant &value)
+void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)
 {
     auto iface = getUserInterface(user);
     if (iface != nullptr && iface->isValid()) {
         // The value needs to be carefully wrapped
-        iface->call("Set", "com.canonical.unity.AccountsService", property, QVariant::fromValue(QDBusVariant(value)));
-    }
-}
-
-QDBusInterface *AccountsService::getUserInterface(const QString &user)
+        iface->call("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));
+    }
+}
+
+void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)
+{
+    // Merge changed and invalidated together
+    QStringList combined;
+    combined << invalid;
+    combined << changed.keys();
+    combined.removeDuplicates();
+
+    Q_EMIT propertiesChanged(getUserForPath(message().path()), interface, combined);
+}
+
+void AccountsServiceDBusAdaptor::maybeChangedSlot()
+{
+    Q_EMIT maybeChanged(getUserForPath(message().path()));
+}
+
+QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)
+{
+    QMap<QString, QDBusInterface *>::const_iterator i;
+    for (i = users.constBegin(); i != users.constEnd(); ++i) {
+        if (i.value()->path() == path) {
+            return i.key();
+        }
+    }
+    return QString();
+}
+
+QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user)
 {
     auto iface = users.value(user);
     if (iface == nullptr && accounts_manager->isValid()) {
         auto answer = accounts_manager->call("FindUserByName", user);
         if (answer.type() == QDBusMessage::ReplyMessage) {
+            auto path = answer.arguments()[0].value<QDBusObjectPath>().path();
+
             iface = new QDBusInterface("org.freedesktop.Accounts",
-                                       answer.arguments()[0].value<QDBusObjectPath>().path(),
+                                       path,
                                        "org.freedesktop.DBus.Properties",
                                        accounts_manager->connection(), this);
+
+            // With its own pre-defined properties, AccountsService is oddly
+            // close-lipped.  It won't send out proper DBus.Properties notices,
+            // but it does have one catch-all Changed() signal.  So let's
+            // listen to that.
+            iface->connection().connect(
+                iface->service(),
+                path,
+                "org.freedesktop.Accounts.User",
+                "Changed",
+                this,
+                SLOT(maybeChangedSlot()));
+
+            // But custom properties do send out the right notifications, so
+            // let's still listen there.
+            iface->connection().connect(
+                iface->service(),
+                path,
+                "org.freedesktop.DBus.Properties",
+                "PropertiesChanged",
+                this,
+                SLOT(propertiesChangedSlot(QString, QVariantMap, QStringList)));
+
             users.insert(user, iface);
         }
     }

=== renamed file 'plugins/AccountsService/AccountsService.h' => 'plugins/AccountsService/AccountsServiceDBusAdaptor.h'
--- plugins/AccountsService/AccountsService.h	2013-08-27 17:29:16 +0000
+++ plugins/AccountsService/AccountsServiceDBusAdaptor.h	2013-09-05 18:10:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012,2013 Canonical, Ltd.
+ * Copyright (C) 2013 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,26 +16,36 @@
  * Authors: Michael Terry <[e-mail]>
  */
 
-#ifndef UNITY_ACCOUNTSSERVICE_H
-#define UNITY_ACCOUNTSSERVICE_H
+#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H
+#define UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H
 
+#include <QDBusContext>
 #include <QDBusInterface>
 #include <QMap>
 #include <QObject>
 #include <QString>
 
-class AccountsService: public QObject
+class AccountsServiceDBusAdaptor: public QObject, public QDBusContext
 {
     Q_OBJECT
 
 public:
-    explicit AccountsService(QObject *parent = 0);
-
-    Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &property);
-    Q_INVOKABLE void setUserProperty(const QString &user, const QString &property, const QVariant &value);
+    explicit AccountsServiceDBusAdaptor(QObject *parent = 0);
+
+    Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &interface, const QString &property);
+    Q_INVOKABLE void setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value);
+
+Q_SIGNALS:
+    void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
+    void maybeChanged(const QString &user); // Standard properties might have changed
+
+private Q_SLOTS:
+    void propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
+    void maybeChangedSlot();
 
 private:
     QDBusInterface *getUserInterface(const QString &user);
+    QString getUserForPath(const QString &path);
 
     QDBusInterface *accounts_manager;
     QMap<QString, QDBusInterface *> users;

=== modified file 'plugins/AccountsService/CMakeLists.txt'
--- plugins/AccountsService/CMakeLists.txt	2013-08-22 20:16:41 +0000
+++ plugins/AccountsService/CMakeLists.txt	2013-09-05 18:10:06 +0000
@@ -4,6 +4,7 @@
 
 add_library(AccountsService-qml MODULE
     AccountsService.cpp
+    AccountsServiceDBusAdaptor.cpp
     plugin.cpp
     )
 

=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
--- plugins/Unity/Launcher/CMakeLists.txt	2013-09-02 08:53:33 +0000
+++ plugins/Unity/Launcher/CMakeLists.txt	2013-09-05 18:10:06 +0000
@@ -17,7 +17,7 @@
     quicklistmodel.cpp
     common/quicklistentry.cpp
     backend/launcherbackend.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
--- plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-09-05 16:01:00 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-09-05 18:10:06 +0000
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "AccountsService.h"
+#include "AccountsServiceDBusAdaptor.h"
 #include "launcherbackend.h"
 
 #include <QDir>
@@ -43,7 +43,7 @@
     m_accounts(nullptr)
 {
     if (useStorage) {
-        m_accounts = new AccountsService(this);
+        m_accounts = new AccountsServiceDBusAdaptor(this);
     }
     m_user = qgetenv("USER");
     syncFromAccounts();
@@ -214,7 +214,7 @@
     m_storedApps.clear();
 
     if (m_accounts && !m_user.isEmpty()) {
-        QVariant variant = m_accounts->getUserProperty(m_user, "launcher-items");
+        QVariant variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");
         apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
         defaults = isDefaultsItem(apps);
     }
@@ -257,7 +257,7 @@
             items << itemToVariant(appId);
         }
 
-        m_accounts->setUserProperty(m_user, "launcher-items", QVariant::fromValue(items));
+        m_accounts->setUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items", QVariant::fromValue(items));
     }
 }
 

=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.h'
--- plugins/Unity/Launcher/backend/launcherbackend.h	2013-09-02 08:53:33 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.h	2013-09-05 18:10:06 +0000
@@ -25,7 +25,7 @@
 #include <QSettings>
 #include <QStringList>
 
-class AccountsService;
+class AccountsServiceDBusAdaptor;
 
 /**
   * @brief An interface that provides all the data needed by the launcher.
@@ -156,7 +156,7 @@
     QList<QString> m_storedApps;
     mutable QHash<QString, LauncherBackendItem*> m_itemCache;
 
-    AccountsService *m_accounts;
+    AccountsServiceDBusAdaptor *m_accounts;
     QString m_user;
 };
 

=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2013-08-02 20:03:16 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2013-09-05 18:10:06 +0000
@@ -23,11 +23,27 @@
 {
 }
 
-QVariant AccountsService::getUserProperty(const QString &, const QString &)
-{
-    return QVariant(false);
-}
-
-void AccountsService::setUserProperty(const QString &, const QString &, const QVariant &)
-{
+QString AccountsService::getUser()
+{
+    return "testuser";
+}
+
+void AccountsService::setUser(const QString &user)
+{
+    Q_UNUSED(user)
+}
+
+bool AccountsService::getDemoEdges()
+{
+    return false;
+}
+
+void AccountsService::setDemoEdges(bool demoEdges)
+{
+    Q_UNUSED(demoEdges)
+}
+
+QString AccountsService::getBackgroundFile()
+{
+    return TOP_SRCDIR "/graphics/phone_background.jpg";
 }

=== modified file 'tests/mocks/AccountsService/AccountsService.h'
--- tests/mocks/AccountsService/AccountsService.h	2013-08-27 17:34:46 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2013-09-05 18:10:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012,2013 Canonical, Ltd.
+ * Copyright (C) 2013 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,12 +27,31 @@
 class AccountsService: public QObject
 {
     Q_OBJECT
+    Q_PROPERTY (QString user
+                READ getUser
+                WRITE setUser
+                NOTIFY userChanged)
+    Q_PROPERTY (bool demoEdges
+                READ getDemoEdges
+                WRITE setDemoEdges
+                NOTIFY demoEdgesChanged)
+    Q_PROPERTY (QString backgroundFile
+                READ getBackgroundFile
+                NOTIFY backgroundFileChanged)
 
 public:
     explicit AccountsService(QObject *parent = 0);
 
-    Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &property);
-    Q_INVOKABLE void setUserProperty(const QString &user, const QString &property, const QVariant &value);
+    QString getUser();
+    void setUser(const QString &user);
+    bool getDemoEdges();
+    void setDemoEdges(bool demoEdges);
+    QString getBackgroundFile();
+
+Q_SIGNALS:
+    void userChanged();
+    void demoEdgesChanged();
+    void backgroundFileChanged();
 };
 
 #endif

=== modified file 'tests/mocks/AccountsService/CMakeLists.txt'
--- tests/mocks/AccountsService/CMakeLists.txt	2013-07-30 23:22:48 +0000
+++ tests/mocks/AccountsService/CMakeLists.txt	2013-09-05 18:10:06 +0000
@@ -1,3 +1,5 @@
+add_definitions(-DTOP_SRCDIR="${CMAKE_SOURCE_DIR}")
+
 add_library(MockAccountsService-qml MODULE
     AccountsService.cpp
     plugin.cpp

=== modified file 'tests/plugins/AccountsService/CMakeLists.txt'
--- tests/plugins/AccountsService/CMakeLists.txt	2013-08-13 23:35:31 +0000
+++ tests/plugins/AccountsService/CMakeLists.txt	2013-09-05 18:10:06 +0000
@@ -25,6 +25,7 @@
 
 add_executable(test-accountsservice
     ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
     client.cpp
     )
 qt5_use_modules(test-accountsservice Core DBus Test)

=== modified file 'tests/plugins/AccountsService/client.cpp'
--- tests/plugins/AccountsService/client.cpp	2013-08-22 14:54:08 +0000
+++ tests/plugins/AccountsService/client.cpp	2013-09-05 18:10:06 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "AccountsService.h"
+#include "AccountsServiceDBusAdaptor.h"
 #include <QSignalSpy>
 #include <QTest>
 
@@ -30,17 +31,28 @@
     void testInvalids()
     {
         // Test various invalid calls
-        AccountsService session;
-        QCOMPARE(session.getUserProperty("NOPE", "demo-edges"), QVariant());
-        QCOMPARE(session.getUserProperty("testuser", "NOPE"), QVariant());
-    }
-
-    void testGetSet()
-    {
-        AccountsService session;
-        QCOMPARE(session.getUserProperty("testuser", "demo-edges"), QVariant(true));
-        session.setUserProperty("testuser", "demo-edges", QVariant(false));
-        QCOMPARE(session.getUserProperty("testuser", "demo-edges"), QVariant(false));
+        AccountsServiceDBusAdaptor session;
+        QCOMPARE(session.getUserProperty("NOPE", "com.canonical.unity.AccountsService", "demo-edges"), QVariant());
+        QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "NOPE"), QVariant());
+    }
+
+    void testGetSetServiceDBusAdaptor()
+    {
+        AccountsServiceDBusAdaptor session;
+        session.setUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges", QVariant(true));
+        QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges"), QVariant(true));
+        session.setUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges", QVariant(false));
+        QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges"), QVariant(false));
+    }
+
+    void testGetSetService()
+    {
+        AccountsService session;
+        session.setUser("testuser");
+        session.setDemoEdges(true);
+        QCOMPARE(session.getDemoEdges(), true);
+        session.setDemoEdges(false);
+        QCOMPARE(session.getDemoEdges(), false);
     }
 };
 

=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
--- tests/plugins/Unity/Launcher/CMakeLists.txt	2013-09-04 22:30:51 +0000
+++ tests/plugins/Unity/Launcher/CMakeLists.txt	2013-09-05 18:10:06 +0000
@@ -21,7 +21,7 @@
 add_custom_target(launcherbackendtest ${testBackendCommand})
 add_executable(launcherbackendtestExec
     launcherbackendtest.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp
     )
@@ -39,7 +39,7 @@
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launchermodel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h