Merge lp:~laney/ubuntu-system-settings/private-as-background into lp:ubuntu-system-settings

[Iain Lane]

[background] Drop direct use of AS & use the new private library.

Drop direct use of AS & use the new private library.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:550
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/568/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/71

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/568/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

I'm not a fan of adding unneeded whitespace, can you drop the blank line after defining m_accountsService?

review: Needs Fixing

[lp:~laney/ubuntu-system-settings/private-as-background]

551. By Iain Lane on 2014-01-07

Remove whitespace after defining m_accountsService

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

=== modified file 'plugins/background/CMakeLists.txt'
--- plugins/background/CMakeLists.txt	2013-11-27 21:21:28 +0000
+++ plugins/background/CMakeLists.txt	2014-01-07 15:12:03 +0000
@@ -1,4 +1,3 @@
-
 set(QML_SOURCES
     MainPage.qml
     OverlayImage.qml
@@ -13,6 +12,8 @@
 ${QML_SOURCES}) # So they show up in Qt designer.
 qt5_use_modules(UbuntuBackgroundPanel Qml Quick DBus)
 
+target_link_libraries(UbuntuBackgroundPanel uss-accountsservice)
+
 set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Background)
 install(TARGETS UbuntuBackgroundPanel DESTINATION ${PLUG_DIR})
 install(FILES qmldir DESTINATION ${PLUG_DIR})

=== modified file 'plugins/background/background.cpp'
--- plugins/background/background.cpp	2013-12-09 17:17:59 +0000
+++ plugins/background/background.cpp	2014-01-07 15:12:03 +0000
@@ -19,6 +19,7 @@
 */
 
 #include "background.h"
+
 #include <QDir>
 #include <QStandardPaths>
 #include <QEvent>
@@ -27,52 +28,24 @@
 #include <QDebug>
 
 Background::Background(QObject *parent) :
-    QObject(parent),
-    m_systemBusConnection (QDBusConnection::systemBus()),
-    m_accountsserviceIface ("org.freedesktop.Accounts",
-                            "/org/freedesktop/Accounts",
-                            "org.freedesktop.Accounts",
-                             m_systemBusConnection)
+    QObject(parent)
 {
-    if (!m_accountsserviceIface.isValid()) {
-        return;
-    }
-
-    QDBusReply<QDBusObjectPath> qObjectPath = m_accountsserviceIface.call(
-                "FindUserById", qlonglong(getuid()));
-
-    if (qObjectPath.isValid()) {
-        m_objectPath = qObjectPath.value().path();
-    }
-
-    m_systemBusConnection.connect("org.freedesktop.Accounts",
-                                  m_objectPath,
-                                  "org.freedesktop.Accounts.User",
-                                  "Changed",
-                                  this,
-                                  SLOT(slotChanged()));
+    QObject::connect(&m_accountsService,
+                     SIGNAL (changed ()),
+                     this,
+                     SLOT (slotChanged()));
     updateUbuntuArt();
     updateCustomBackgrounds();
 }
 
 QString Background::getBackgroundFile()
 {
-    QDBusInterface userInterface (
-                "org.freedesktop.Accounts",
-                m_objectPath,
-                "org.freedesktop.DBus.Properties",
-                m_systemBusConnection,
-                this);
-
-    if (userInterface.isValid()) {
-        QDBusReply<QDBusVariant> answer = userInterface.call (
-                    "Get",
-                    "org.freedesktop.Accounts.User",
-                    "BackgroundFile");
-
-        if (answer.isValid())
-            return answer.value().variant().toString();
-    }
+    QVariant answer = m_accountsService.getUserProperty(
+                "org.freedesktop.Accounts.User",
+                "BackgroundFile");
+
+    if (answer.isValid())
+        return answer.toString();
 
     return QString();
 }
@@ -85,18 +58,9 @@
     if (backgroundFile.url() == m_backgroundFile)
         return;
 
-    QDBusInterface userInterface (
-                "org.freedesktop.Accounts",
-                m_objectPath,
-                "org.freedesktop.Accounts.User",
-                m_systemBusConnection,
-                this);
-
-    if (!userInterface.isValid())
-        return;
-
     m_backgroundFile = backgroundFile.url();
-    userInterface.call("SetBackgroundFile", backgroundFile.path());
+    m_accountsService.customSetUserProperty("SetBackgroundFile",
+                                            backgroundFile.path());
     Q_EMIT backgroundFileChanged();
 }
 

=== modified file 'plugins/background/background.h'
--- plugins/background/background.h	2013-12-09 17:27:10 +0000
+++ plugins/background/background.h	2014-01-07 15:12:03 +0000
@@ -21,6 +21,8 @@
 #ifndef BACKGROUND_H
 #define BACKGROUND_H
 
+#include "accountsservice.h"
+
 #include <QDBusInterface>
 #include <QObject>
 #include <QProcess>
@@ -60,14 +62,12 @@
     void ubuntuArtChanged();
 
 private:
+    AccountsService m_accountsService;
     QStringList m_ubuntuArt;
     QStringList m_customBackgrounds;
     void updateCustomBackgrounds();
     void updateUbuntuArt();
     QString m_backgroundFile;
-    QDBusConnection m_systemBusConnection;
-    QString m_objectPath;
-    QDBusInterface m_accountsserviceIface;
     QString getBackgroundFile();
 };