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

[Iain Lane]

Create a private library for communicating with accountsservice.

Since we're about to be doing AS in yet another location, it makes sense to factor this stuff out. I made a private library called libuss-accountsservice, but another option would be to have a utilities library. Doesn't matter what we choose now, since we can do whatever is necessary as this is only an internal library.

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

549. By Iain Lane on 2014-01-07

Set RPATH to have the runtime linker find the private libraries

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

looks great

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-12-10 00:26:51 +0000
+++ CMakeLists.txt	2014-01-07 10:49:39 +0000
@@ -57,10 +57,13 @@
 
 set(ANDR_PROP_LIB -landroid-properties)
 
+SET(CMAKE_INSTALL_RPATH "${PLUGIN_MODULE_DIR}")
+
 add_subdirectory(po)
 add_subdirectory(schema)
 add_subdirectory(lib)
 include_directories(lib)
+include_directories(src)
 add_subdirectory(plugins)
 add_subdirectory(src)
 add_subdirectory(tests)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-12-10 15:01:37 +0000
+++ src/CMakeLists.txt	2014-01-07 10:49:39 +0000
@@ -7,7 +7,7 @@
 
 add_subdirectory(SystemSettings)
 
-set(USS_SOURCES 
+set(USS_SOURCES
     debug.cpp
     i18n.cpp
     item-model.cpp
@@ -32,6 +32,11 @@
 target_link_libraries(system-settings SystemSettings)
 install(TARGETS system-settings RUNTIME DESTINATION bin)
 
+add_library(uss-accountsservice SHARED accountsservice.h accountsservice.cpp)
+qt5_use_modules(uss-accountsservice Core Qml DBus)
+set_target_properties(uss-accountsservice PROPERTIES VERSION 0.0 SOVERSION 0.0)
+install(TARGETS uss-accountsservice LIBRARY DESTINATION ${PLUGIN_MODULE_DIR} NAMELINK_SKIP)
+
 add_custom_target(po COMMAND
 ${XGETTEXT_BIN} -o ${CMAKE_SOURCE_DIR}/po/ubuntu-system-settings.pot -d ubuntu-system-settings
 --keyword=_ ${USS_SOURCES}

=== added file 'src/accountsservice.cpp'
--- src/accountsservice.cpp	1970-01-01 00:00:00 +0000
+++ src/accountsservice.cpp	2014-01-07 10:49:39 +0000
@@ -0,0 +1,157 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Iain Lane <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+#include "accountsservice.h"
+
+#include <QDBusReply>
+
+#include <unistd.h>
+#include <sys/types.h>
+
+#define AS_SERVICE "org.freedesktop.Accounts"
+#define AS_PATH "/org/freedesktop/Accounts"
+#define AS_IFACE "org.freedesktop.Accounts"
+
+AccountsService::AccountsService(QObject *parent)
+    : QObject(parent),
+      m_systemBusConnection(QDBusConnection::systemBus()),
+      m_serviceWatcher(AS_SERVICE,
+                       m_systemBusConnection,
+                       QDBusServiceWatcher::WatchForOwnerChange),
+      m_accountsserviceIface(AS_SERVICE,
+                             AS_PATH,
+                             AS_IFACE,
+                             m_systemBusConnection)
+{
+    connect (&m_serviceWatcher,
+             SIGNAL (serviceOwnerChanged (QString, QString, QString)),
+             this,
+             SLOT (slotNameOwnerChanged (QString, QString, QString)));
+
+    if (m_accountsserviceIface.isValid()) {
+        setUpInterface();
+    }
+}
+
+void AccountsService::slotChanged(QString interface,
+                                  QVariantMap changed_properties,
+                                  QStringList invalidated_properties)
+{
+    Q_UNUSED (changed_properties);
+
+    Q_FOREACH (const QString prop, invalidated_properties)
+        Q_EMIT propertyChanged(interface, prop);
+}
+
+
+void AccountsService::slotNameOwnerChanged(QString name,
+                                           QString oldOwner,
+                                           QString newOwner)
+{
+    Q_UNUSED (oldOwner);
+    Q_UNUSED (newOwner);
+    if (name != "org.freedesktop.Accounts")
+        return;
+
+    setUpInterface();
+    Q_EMIT (nameOwnerChanged());
+}
+
+void AccountsService::setUpInterface()
+{
+    QDBusReply<QDBusObjectPath> qObjectPath = m_accountsserviceIface.call(
+                "FindUserById", qlonglong(getuid()));
+
+    if (qObjectPath.isValid()) {
+        m_objectPath = qObjectPath.value().path();
+        m_accountsserviceIface.connection().connect(
+            m_accountsserviceIface.service(),
+            m_objectPath,
+            "org.freedesktop.DBus.Properties",
+            "PropertiesChanged",
+            this,
+            SLOT(slotChanged(QString, QVariantMap, QStringList)));
+        m_accountsserviceIface.connection().connect(
+            m_accountsserviceIface.service(),
+            m_objectPath,
+            "org.freedesktop.Accounts.User",
+            "Changed",
+            this,
+            SIGNAL (changed ()));
+    }
+}
+
+QVariant AccountsService::getUserProperty(const QString &interface,
+                                          const QString &property)
+{
+    if (!m_accountsserviceIface.isValid())
+        return QVariant();
+
+    QDBusInterface iface (
+                "org.freedesktop.Accounts",
+                m_objectPath,
+                "org.freedesktop.DBus.Properties",
+                m_systemBusConnection,
+                this);
+
+    if (iface.isValid()) {
+        QDBusReply<QDBusVariant> answer = iface.call(
+                    "Get",
+                    interface,
+                    property);
+        if (answer.isValid()) {
+            return answer.value().variant();
+        }
+    }
+    return QVariant();
+}
+
+void AccountsService::setUserProperty(const QString &interface,
+                                      const QString &property,
+                                      const QVariant &value)
+{
+    QDBusInterface iface (
+                 "org.freedesktop.Accounts",
+                m_objectPath,
+                "org.freedesktop.DBus.Properties",
+                m_systemBusConnection,
+                this);
+    if (iface.isValid()) {
+        // The value needs to be carefully wrapped
+        iface.call("Set",
+                   interface,
+                   property,
+                   QVariant::fromValue(QDBusVariant(value)));
+    }
+}
+
+void AccountsService::customSetUserProperty(const QString &method,
+                                            const QVariant &value)
+{
+    QDBusInterface iface ("org.freedesktop.Accounts",
+                          m_objectPath,
+                          "org.freedesktop.Accounts.User",
+                          m_systemBusConnection,
+                          this);
+
+    if (iface.isValid())
+        iface.call(method, value);
+
+}

=== added file 'src/accountsservice.h'
--- src/accountsservice.h	1970-01-01 00:00:00 +0000
+++ src/accountsservice.h	2014-01-07 10:49:39 +0000
@@ -0,0 +1,64 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Iain Lane <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+#ifndef ACCOUNTSSERVICE_H
+#define ACCOUNTSSERVICE_H
+
+#include <QDBusServiceWatcher>
+#include <QStringList>
+#include <QtDBus/QDBusInterface>
+
+class AccountsService : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AccountsService (QObject *parent = 0);
+
+    QString getProperty (QString property);
+    QVariant getUserProperty(const QString &interface,
+                             const QString &property);
+    void setUserProperty(const QString &interface,
+                         const QString &property,
+                         const QVariant &value);
+    void customSetUserProperty(const QString &method,
+                               const QVariant &value);
+
+
+public Q_SLOTS:
+    void slotChanged(QString, QVariantMap, QStringList);
+    void slotNameOwnerChanged(QString, QString, QString);
+
+Q_SIGNALS:
+    void propertyChanged(QString interface, QString property);
+    void changed();
+    void nameOwnerChanged();
+
+private:
+    QDBusConnection m_systemBusConnection;
+    QDBusServiceWatcher m_serviceWatcher;
+    QDBusInterface m_accountsserviceIface;
+    QString m_objectPath;
+
+    void setUpInterface();
+
+};
+
+#endif // ACCOUNTSSERVICE_H