Merge lp:~dbarth/ubuntu-system-settings-online-accounts/inline-plugin into lp:ubuntu-system-settings-online-accounts

[David Barth]

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:150
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dbarth/ubuntu-system-settings-online-accounts/inline-plugin/+merge/230301/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/143/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3309/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-i386-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4554/console

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

review: Needs Fixing (continuous-integration)

[lp:~dbarth/ubuntu-system-settings-online-accounts/inline-plugin]

131. By David Barth on 2014-08-12

inline plugin take 2; made of bzr move'd qml files

132. By David Barth on 2014-08-12

only support OAuth providers for now

133. By David Barth on 2014-08-13

navigate back up once an account is removed

134. By David Barth on 2014-08-13

Simplify code by using Setup{} and Options{}

135. By David Barth on 2014-08-13

cleanups

136. By David Barth on 2014-08-13

no more plugin code

137. By David Barth on 2014-08-13

fix build in the rest of the project

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2014-06-05 13:28:30 +0000
+++ .bzrignore	2014-08-11 13:15:20 +0000
@@ -46,3 +46,4 @@
 /tests/online-accounts-ui/tst_inactivity_timer
 /tests/online-accounts-ui/tst_notification
 /tests/online-accounts-ui/tst_service
+/tests/online-accounts-ui/tst_signonui_request

=== modified file 'debian/control'
--- debian/control	2014-06-04 12:00:43 +0000
+++ debian/control	2014-08-11 13:15:20 +0000
@@ -36,7 +36,6 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
          signon-ui-service,
          ubuntu-system-settings
-Provides: signon-ui
 Description: Online Accounts setup for Ubuntu Touch
  Online Accounts setup utility for the Ubuntu Touch System Settings.
 

=== modified file 'src/browser-request.cpp'
--- src/browser-request.cpp	2014-04-29 14:34:44 +0000
+++ src/browser-request.cpp	2014-08-11 13:15:20 +0000
@@ -28,6 +28,7 @@
 
 #include <QDir>
 #include <QQmlContext>
+#include <QQmlEngine>
 #include <QStandardPaths>
 #include <QTimer>
 #include <SignOn/uisessiondata_priv.h>
@@ -133,18 +134,9 @@
         QObject::connect(m_dialog, SIGNAL(finished(int)),
                          this, SLOT(onFinished()));
 
-        QUrl webview("qrc:/MainWindow.qml");
-        QDir qmlDir("/usr/share/signon-ui/qml");
-        if (qmlDir.exists())
-        {
-            QFileInfo qmlFile(qmlDir.absolutePath() + "/MainWindow.qml");
-            if (qmlFile.exists())
-                webview.setUrl(qmlFile.absoluteFilePath());
-        }
-
+        m_dialog->engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
         m_dialog->rootContext()->setContextProperty("request", this);
-        m_dialog->rootContext()->setContextProperty("rootDir", m_rootDir);
-        m_dialog->setSource(webview);
+        m_dialog->setSource(QUrl("qrc:/qml/SignOnUiPage.qml"));
     } else {
         DEBUG() << "Setting request on handler";
         q->handler()->setRequest(this);
@@ -208,7 +200,7 @@
 
 void BrowserRequestPrivate::onLoadFinished(bool ok)
 {
-    Q_Q(const BrowserRequest);
+    Q_Q(BrowserRequest);
 
     DEBUG() << "Load finished" << ok;
 
@@ -219,9 +211,7 @@
 
     if (m_dialog && !m_dialog->isVisible()) {
         if (m_responseUrl.isEmpty()) {
-            Dialog::ShowMode mode =
-                (q->windowId() == 0) ? Dialog::TopLevel : Dialog::Transient;
-            m_dialog->show(q->windowId(), mode);
+            q->setWindow(m_dialog);
         } else {
             onFinished();
         }

=== modified file 'src/module/OAuth.qml'
--- src/module/OAuth.qml	2014-04-29 12:11:55 +0000
+++ src/module/OAuth.qml	2014-08-11 13:15:20 +0000
@@ -55,7 +55,6 @@
             if (request) {
                 console.log("RequestHandler captured request!")
                 loader.setSource("WebView.qml", {
-                    "rootDir": request.rootDir,
                     "signonRequest": request
                 })
             } else {

=== modified file 'src/module/WebView.qml'
--- src/module/WebView.qml	2014-04-29 12:11:55 +0000
+++ src/module/WebView.qml	2014-08-11 13:15:20 +0000
@@ -5,7 +5,6 @@
 
 UbuntuWebView {
     property QtObject signonRequest
-    property url rootDir
 
     Component.onCompleted: url = signonRequest.startUrl
 
@@ -22,6 +21,6 @@
     onUrlChanged: signonRequest.currentUrl = url
 
     context: UbuntuWebContext {
-        dataPath: rootDir
+        dataPath: signonRequest.rootDir
     }
 }

=== modified file 'src/module/qmldir.in'
--- src/module/qmldir.in	2013-06-05 11:33:39 +0000
+++ src/module/qmldir.in	2014-08-11 13:15:20 +0000
@@ -1,7 +1,9 @@
 module $${API_URI}
+KeyboardRectangle 1.0 KeyboardRectangle.qml
 OAuthMain 1.0 OAuthMain.qml
 OAuth 1.0 OAuth.qml
 Options 1.0 Options.qml
 RemovalConfirmation 1.0 RemovalConfirmation.qml
 ServiceItem 1.0 ServiceItem.qml
 ServiceSwitches 1.0 ServiceSwitches.qml
+WebView 1.0 WebView.qml

=== modified file 'src/notification.cpp'
--- src/notification.cpp	2014-06-05 13:28:30 +0000
+++ src/notification.cpp	2014-08-11 13:15:20 +0000
@@ -108,6 +108,14 @@
                                    this, NULL);
 }
 
+void Notification::setSnapDecision(bool snapDecision)
+{
+    Q_D(Notification);
+    notify_notification_set_hint(d->m_notification,
+                                 "x-canonical-snap-decisions",
+                                 g_variant_new_boolean(snapDecision));
+}
+
 void Notification::show()
 {
     Q_D(Notification);

=== modified file 'src/notification.h'
--- src/notification.h	2014-06-05 13:28:30 +0000
+++ src/notification.h	2014-08-11 13:15:20 +0000
@@ -37,6 +37,7 @@
     ~Notification();
 
     void addAction(const QString &action, const QString &label);
+    void setSnapDecision(bool snapDecision);
 
 public Q_SLOTS:
     void show();

=== modified file 'src/online-accounts-ui.pro'
--- src/online-accounts-ui.pro	2014-06-05 13:28:30 +0000
+++ src/online-accounts-ui.pro	2014-08-11 13:15:20 +0000
@@ -92,7 +92,8 @@
     qml/NormalStartupPage.qml \
     qml/ProviderPluginList.qml \
     qml/ProviderRequest.qml \
-    qml/ProvidersList.qml
+    qml/ProvidersList.qml \
+    qml/SignOnUiPage.qml
 
 RESOURCES += \
     ui.qrc

=== added file 'src/qml/SignOnUiPage.qml'
--- src/qml/SignOnUiPage.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SignOnUiPage.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,40 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+MainView {
+    id: root
+
+    property var signonRequest: request
+
+    width: units.gu(60)
+    height: units.gu(90)
+
+    Page {
+        WebView {
+            id: loader
+            signonRequest: root.signonRequest
+
+            anchors {
+                fill: parent
+                bottomMargin: Math.max(osk.height, cancelButton.height)
+            }
+        }
+
+        ListItem.SingleControl {
+            id: cancelButton
+            anchors.bottom: parent.bottom
+            showDivider: false
+            control: Button {
+                text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
+                width: parent.width - units.gu(4)
+                onClicked: signonRequest.cancel()
+            }
+        }
+
+        KeyboardRectangle {
+            id: osk
+        }
+    }
+}

=== modified file 'src/signonui-request.cpp'
--- src/signonui-request.cpp	2014-06-05 13:28:30 +0000
+++ src/signonui-request.cpp	2014-08-11 13:15:20 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of online-accounts-ui
  *
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2014 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -20,13 +20,16 @@
 
 #include "signonui-request.h"
 
+#include "account-manager.h"
+#include "application-manager.h"
 #include "browser-request.h"
 #include "debug.h"
 #include "globals.h"
-#include "indicator-service.h"
+#include "notification.h"
 
 #include <Accounts/Account>
-#include <Accounts/Manager>
+#include <Accounts/Application>
+#include <Accounts/Provider>
 #include <QDBusArgument>
 #include <SignOn/uisessiondata.h>
 #include <SignOn/uisessiondata_priv.h>
@@ -45,16 +48,19 @@
     ~RequestPrivate();
 
 private:
-    bool setWindow(QWindow *window);
+    void setWindow(QWindow *window);
     Accounts::Account *findAccount();
-    bool dispatchToIndicator();
+
+private Q_SLOTS:
+    void onActionInvoked(const QString &action);
+    void onNotificationClosed();
 
 private:
     mutable Request *q_ptr;
     QVariantMap m_clientData;
-    bool m_inProgress;
     RequestHandler *m_handler;
-    Accounts::Manager *m_accountManager;
+    OnlineAccountsUi::Notification *m_notification;
+    QWindow *m_window;
 };
 
 } // namespace
@@ -62,9 +68,9 @@
 RequestPrivate::RequestPrivate(Request *request):
     QObject(request),
     q_ptr(request),
-    m_inProgress(false),
     m_handler(0),
-    m_accountManager(0)
+    m_notification(0),
+    m_window(0)
 {
     const QVariantMap &parameters = request->parameters();
     if (parameters.contains(SSOUI_KEY_CLIENT_DATA)) {
@@ -77,20 +83,51 @@
 
 RequestPrivate::~RequestPrivate()
 {
+    delete m_notification;
+    m_notification = 0;
 }
 
-bool RequestPrivate::setWindow(QWindow *window)
+void RequestPrivate::setWindow(QWindow *window)
 {
     Q_Q(Request);
-    Q_UNUSED(window);
 
-    /* If the window has no parent and the webcredentials indicator service is
-     * up, dispatch the request to it. */
-    if (q->windowId() == 0 && dispatchToIndicator()) {
-        return true;
+    /* Don't show the window yet: the user must be presented with a
+     * snap-decision, and we'll show the window only if he decides to
+     * authenticate. */
+    Accounts::Account *account = findAccount();
+    if (Q_UNLIKELY(!account)) {
+        QVariantMap result;
+        result[SSOUI_KEY_ERROR] = SignOn::QUERY_ERROR_FORBIDDEN;
+        q->setResult(result);
+        return;
     }
 
-    return false;
+    OnlineAccountsUi::ApplicationManager *appManager =
+        OnlineAccountsUi::ApplicationManager::instance();
+    Accounts::Application application =
+        appManager->applicationFromProfile(q->clientApparmorProfile());
+
+    OnlineAccountsUi::AccountManager *accountManager =
+        OnlineAccountsUi::AccountManager::instance();
+    Accounts::Provider provider =
+        accountManager->provider(account->providerName());
+
+    QString summary =
+        QString("Please authorize %1 to access your %2 account %3").
+        arg(application.isValid() ? application.displayName() : "Ubuntu").
+        arg(provider.displayName()).
+        arg(account->displayName());
+    m_notification =
+        new OnlineAccountsUi::Notification("Authentication request", summary);
+    m_notification->addAction("cancel", "Cancel");
+    m_notification->addAction("continue", "Authorize...");
+    m_notification->setSnapDecision(true);
+    QObject::connect(m_notification, SIGNAL(actionInvoked(const QString &)),
+                     this, SLOT(onActionInvoked(const QString &)));
+    QObject::connect(m_notification, SIGNAL(closed()),
+                     this, SLOT(onNotificationClosed()));
+    m_notification->show();
+    m_window = window;
 }
 
 Accounts::Account *RequestPrivate::findAccount()
@@ -104,11 +141,10 @@
     /* Find the account using this identity.
      * FIXME: there might be more than one!
      */
-    if (m_accountManager == 0) {
-        m_accountManager = new Accounts::Manager(this);
-    }
-    Q_FOREACH(Accounts::AccountId accountId, m_accountManager->accountList()) {
-        Accounts::Account *account = m_accountManager->account(accountId);
+    OnlineAccountsUi::AccountManager *manager =
+        OnlineAccountsUi::AccountManager::instance();
+    Q_FOREACH(Accounts::AccountId accountId, manager->accountList()) {
+        Accounts::Account *account = manager->account(accountId);
         if (account == 0) continue;
 
         QVariant value(QVariant::UInt);
@@ -122,34 +158,40 @@
     return 0;
 }
 
-bool RequestPrivate::dispatchToIndicator()
+void RequestPrivate::onActionInvoked(const QString &action)
 {
     Q_Q(Request);
 
-    Accounts::Account *account = findAccount();
-    if (account == 0) {
-        return false;
+    DEBUG() << action;
+
+    QObject::disconnect(m_notification, 0, this, 0);
+    m_notification->deleteLater();
+    m_notification = 0;
+
+    if (action == QStringLiteral("continue")) {
+        q->setWindow(m_window);
+    } else {
+        q->cancel();
     }
-
-    QVariantMap notification;
-    notification["DisplayName"] = account->displayName();
-    notification["ClientData"] = m_clientData;
-    notification["Identity"] = q->identity();
-    notification["Method"] = q->method();
-    notification["Mechanism"] = q->mechanism();
-
-    IndicatorService *indicator = IndicatorService::instance();
-    indicator->reportFailure(account->id(), notification);
-
-    /* the account has been reported as failing. We can now close this
-     * request, and tell the application that UI interaction is forbidden.
-     */
+}
+
+void RequestPrivate::onNotificationClosed()
+{
+    Q_Q(Request);
+
+    DEBUG();
+
+    /* setResult() should have been called by onActionInvoked(), but calling it
+     * twice won't harm because only the first invocation counts. */
     QVariantMap result;
     result[SSOUI_KEY_ERROR] = SignOn::QUERY_ERROR_FORBIDDEN;
     q->setResult(result);
-    return true;
+
+    m_notification->deleteLater();
+    m_notification = 0;
 }
 
+#ifndef NO_REQUEST_FACTORY
 Request *Request::newRequest(const QDBusConnection &connection,
                              const QDBusMessage &message,
                              const QVariantMap &parameters,
@@ -162,6 +204,7 @@
         return 0; // TODO new DialogRequest(connection, message, parameters, parent);
     }
 }
+#endif
 
 Request::Request(const QDBusConnection &connection,
                  const QDBusMessage &message,
@@ -189,8 +232,22 @@
 void Request::setWindow(QWindow *window)
 {
     Q_D(Request);
-    if (!d->setWindow(window))
+
+    /* While a notification is shown, ignore any further calls to
+     * setWindow(). */
+    if (d->m_notification) return;
+
+    /* The first time that this method is called, we handle it by presenting a
+     * snap decision to the user.
+     * Then, if this is called again with the same QWindow, it means that the
+     * snap decision was accepted, and we show the window.
+     */
+    if (window == d->m_window) {
         OnlineAccountsUi::Request::setWindow(window);
+        d->m_window = 0;
+    } else {
+        d->setWindow(window);
+    }
 }
 
 uint Request::identity() const
@@ -232,12 +289,10 @@
 
 void Request::setCanceled()
 {
-    if (isInProgress()) {
-        QVariantMap result;
-        result[SSOUI_KEY_ERROR] = SignOn::QUERY_ERROR_CANCELED;
+    QVariantMap result;
+    result[SSOUI_KEY_ERROR] = SignOn::QUERY_ERROR_CANCELED;
 
-        setResult(result);
-    }
+    setResult(result);
 }
 
 #include "signonui-request.moc"

=== modified file 'src/ui.qrc'
--- src/ui.qrc	2014-03-19 12:14:14 +0000
+++ src/ui.qrc	2014-08-11 13:15:20 +0000
@@ -13,5 +13,6 @@
     <file>qml/ProviderPluginList.qml</file>
     <file>qml/ProviderRequest.qml</file>
     <file>qml/ProvidersList.qml</file>
+    <file>qml/SignOnUiPage.qml</file>
 </qresource>
 </RCC>

=== added file 'system-settings-plugin/AccountEditPage.qml'
--- system-settings-plugin/AccountEditPage.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/AccountEditPage.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.OnlineAccounts 0.1
+
+// HACK
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+Page {
+    id: root
+
+    property variant accountHandle
+
+    signal finished
+
+    title: account.provider.displayName
+
+    Account {
+        id: account
+        objectHandle: accountHandle
+    }
+
+/*    Loader {
+        id: loader
+        property var account: account
+
+        anchors.fill: parent
+        source: localQmlPluginPath + account.provider.id + "/Main.qml"
+
+        onStatusChanged: {
+            if (loader.status == Loader.Error) {
+                loader.source = systemQmlPluginPath + account.provider.id + "/Main.qml"
+            }
+        }
+
+
+        Connections {
+            target: loader.item
+            onFinished: {
+                console.log("====== PLUGIN FINISHED ======")
+                root.finished()
+            }
+        }
+    }
+*/
+    // HACK: this only suppots OAuth-based providers...
+    OAuthMain {}
+
+}

=== added file 'system-settings-plugin/AccountItem.qml'
--- system-settings-plugin/AccountItem.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/AccountItem.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.OnlineAccounts 0.1
+
+ListItem.Subtitled {
+    property variant accountHandle
+    property variant globalServiceHandle
+    property variant __editPage: null
+    property bool running: false
+
+    iconName: globalService.provider.iconName
+    progression: true
+    opacity: globalService.enabled ? 1 : 0.5
+
+    resources: [
+        AccountService {
+            id: globalService
+            objectHandle: globalServiceHandle
+        },
+        Component {
+            id: accountEditPage
+            AccountEditPage {}
+        }
+    ]
+
+    onClicked: {
+        __editPage = accountEditPage.createObject(null, {
+            "accountHandle": accountHandle })
+        __editPage.finished.connect(__onEditFinished)
+        pageStack.push(__editPage)
+        running = true;
+    }
+
+    function __onEditFinished() {
+        __editPage.destroy(1000)
+        __editPage = null
+        pageStack.pop()
+        running = false
+    }
+}

=== added file 'system-settings-plugin/AccountsPage.qml'
--- system-settings-plugin/AccountsPage.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/AccountsPage.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Flickable {
+    id: root
+    property variant accountsModel
+    contentHeight: contentItem.childrenRect.height
+    boundsBehavior: Flickable.StopAtBounds
+
+    Column {
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        ListView {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            interactive: false
+            height: contentHeight
+            model: accountsModel
+
+            delegate: AccountItem {
+                ListView.delayRemove: running
+                text: providerName
+                subText: displayName
+                accountHandle: model.accountHandle
+                globalServiceHandle: accountServiceHandle
+            }
+        }
+
+        ListItem.SingleControl {
+            control: Button {
+                text: i18n.tr("Add account…")
+                width: parent.width - units.gu(4)
+                onClicked: pageStack.push(newAccountPage)
+            }
+            showDivider: false
+        }
+
+        AddAccountLabel {}
+    }
+
+    Component {
+        id: newAccountPage
+        NewAccountPage {}
+    }
+}

=== added file 'system-settings-plugin/AddAccountLabel.qml'
--- system-settings-plugin/AddAccountLabel.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/AddAccountLabel.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+ListItem.Caption {
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.margins: units.gu(2)
+    text: i18n.tr("Storing account details here lets apps use the accounts without you having to sign in for each app.")
+}

=== added file 'system-settings-plugin/AuthorizationPage.qml'
--- system-settings-plugin/AuthorizationPage.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/AuthorizationPage.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Flickable {
+    id: root
+
+    property variant model
+    property variant application
+    property variant provider
+
+    signal allowed(int accountId)
+    signal denied
+    signal createAccount
+
+    Column {
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            text: i18n.tr("%1 wants to access your %2 account").
+                arg(application.displayName).arg(provider.displayName);
+            wrapMode: Text.WordWrap
+        }
+
+        ListItem.ItemSelector {
+            id: accountSelector
+            anchors.left: parent.left
+            anchors.right: parent.right
+            text: "Account"
+            model: root.model
+            delegate: OptionSelectorDelegate {
+                property string modelData: model.displayName
+            }
+            onDelegateClicked: {
+                /* The last item in the model is the "Add another..." label */
+                if (index == model.count - 1) root.createAccount();
+            }
+        }
+
+        Button {
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: parent.width - units.gu(4)
+            text: i18n.tr("Allow")
+            onClicked: root.allowed(root.model.get(accountSelector.selectedIndex, "accountId"))
+        }
+
+        Button {
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: parent.width - units.gu(4)
+            text: i18n.tr("Don't allow")
+            onClicked: root.denied()
+        }
+    }
+}

=== added file 'system-settings-plugin/EntryComponent.qml'
--- system-settings-plugin/EntryComponent.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/EntryComponent.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,33 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+ListItem.Standard {
+    id: root
+
+    objectName: "entryComponent-about"
+    iconSource: Qt.resolvedUrl(model.icon)
+    iconFrame: false
+    text: i18n.tr(model.displayName)
+    progression: true
+}

=== added file 'system-settings-plugin/MainPage.qml'
--- system-settings-plugin/MainPage.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/MainPage.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import SystemSettings 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.OnlineAccounts 0.1
+
+ItemPage {
+    id: root
+    objectName: "accountsPage"
+
+    title: i18n.tr("Accounts")
+
+    // OnlineAccountsPanel {
+    //    id: onlineAccountsPanel
+    // }
+
+    property Item flickable: accountsPage.visible ? accountsPage : noAccountsPage
+
+    AccountServiceModel {
+        id: accountsModel
+        service: "global"
+        includeDisabled: true
+    }
+    
+    AccountsPage {
+        id: accountsPage
+        anchors.fill: parent
+        accountsModel: accountsModel
+        visible: accountsModel.count > 0
+    }
+    
+    NoAccountsPage {
+        id: noAccountsPage
+        anchors.fill: parent
+        accountsModel: accountsModel
+        visible:!accountsPage.visible
+    }
+
+
+    Component {
+        id: accountCreationPage
+        AccountCreationPage {
+            providerId: pluginOptions.provider
+        }
+    }
+
+}
+

=== added file 'system-settings-plugin/NewAccountPage.qml'
--- system-settings-plugin/NewAccountPage.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/NewAccountPage.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Page {
+    title: i18n.tr("Add account")
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: Flickable.StopAtBounds
+
+        ProviderPluginList {
+            onCreationFinished: {
+                // pop the creation page and this page (go back to parent page)
+                pageStack.pop()
+                pageStack.pop()
+            }
+        }
+    }
+}

=== added file 'system-settings-plugin/NoAccountsPage.qml'
--- system-settings-plugin/NoAccountsPage.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/NoAccountsPage.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Flickable {
+    id: root
+
+    property variant accountsModel
+    contentHeight: contentItem.childrenRect.height
+    boundsBehavior: Flickable.StopAtBounds
+
+    Column {
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        ListItem.Base {
+            Label {
+                text: i18n.tr("No accounts")
+                anchors.centerIn: parent
+            }
+        }
+
+        AddAccountLabel {}
+
+        ListItem.Standard {
+            text: i18n.tr("Add account:")
+        }
+
+        ProviderPluginList {
+            onCreationFinished: {
+                // pop the creation page; remain in this page
+                pageStack.pop()
+            }
+        }
+    }
+}

=== added file 'system-settings-plugin/NormalStartupPage.qml'
--- system-settings-plugin/NormalStartupPage.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/NormalStartupPage.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.OnlineAccounts 0.1
+
+Item {
+    id: root
+
+    property Item flickable: accountsPage.visible ? accountsPage : noAccountsPage
+
+    AccountServiceModel {
+        id: accountsModel
+        service: "global"
+        includeDisabled: true
+    }
+
+    AccountsPage {
+        id: accountsPage
+        anchors.fill: parent
+        accountsModel: accountsModel
+        visible: accountsModel.count > 0
+    }
+
+    NoAccountsPage {
+        id: noAccountsPage
+        anchors.fill: parent
+        accountsModel: accountsModel
+        visible: !accountsPage.visible
+    }
+}

=== added file 'system-settings-plugin/ProviderPluginList.qml'
--- system-settings-plugin/ProviderPluginList.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/ProviderPluginList.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+ProvidersList {
+    id: root
+
+    property variant __creationPage: null
+
+    signal creationFinished
+
+    onProviderClicked: {
+        __creationPage = accountCreationPage.createObject(null, {
+            "providerId": providerId })
+        __creationPage.finished.connect(__onCreationFinished)
+        pageStack.push(__creationPage)
+    }
+
+    function __onCreationFinished() {
+        __creationPage.destroy(1000)
+        __creationPage.finished.disconnect(__onCreationFinished)
+        __creationPage = null
+        creationFinished()
+    }
+}

=== added file 'system-settings-plugin/ProvidersList.qml'
--- system-settings-plugin/ProvidersList.qml	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/ProvidersList.qml	2014-08-11 13:15:20 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.OnlineAccounts 0.1
+
+Column {
+    id: root
+
+    signal providerClicked(string providerId)
+
+    anchors.left: parent.left
+    anchors.right: parent.right
+
+    ProviderModel {
+        id: providerModel
+    }
+
+    Repeater {
+        model: providerModel
+
+        delegate: ListItem.Standard {
+            text: displayName
+            enabled: !isSingleAccount || hasNoAccounts(providerId)
+            iconName: model.iconName
+            progression: true
+            onClicked: root.providerClicked(providerId)
+        }
+    }
+
+    Component {
+        id: accountModel
+        AccountServiceModel {
+            includeDisabled: true
+        }
+    }
+
+    function hasNoAccounts(providerId) {
+        var model = accountModel.createObject(null, {
+            "provider": providerId })
+        var hasAccounts = (model.count > 0)
+        model.destroy()
+        return !hasAccounts
+    }
+}

=== modified file 'system-settings-plugin/online-accounts.settings'
--- system-settings-plugin/online-accounts.settings	2013-09-09 10:56:53 +0000
+++ system-settings-plugin/online-accounts.settings	2014-08-11 13:15:20 +0000
@@ -11,5 +11,6 @@
     ],
     "has-dynamic-keywords": true,
     "has-dynamic-visibility": false,
-    "plugin": "online-accounts"
+    "entry-component": "EntryComponent.qml",
+    "page-component": "MainPage.qml"
 }

=== modified file 'system-settings-plugin/plugin.cpp'
--- system-settings-plugin/plugin.cpp	2014-05-30 08:55:40 +0000
+++ system-settings-plugin/plugin.cpp	2014-08-11 13:15:20 +0000
@@ -16,74 +16,21 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QtQml>
+#include <QtQml/QQmlContext>
 #include "plugin.h"
-
-#include <OnlineAccountsClient/Setup>
-#include <QDebug>
-#include <QStringList>
-#include <SystemSettings/ItemBase>
-
-using namespace SystemSettings;
-
-class Item: public ItemBase
-{
-    Q_OBJECT
-
-public:
-    Item(const QVariantMap &staticData, QObject *parent = 0);
-    ~Item();
-
-    QQmlComponent *pageComponent(QQmlEngine *engine,
-                                 QObject *parent = 0) Q_DECL_OVERRIDE;
-
-private Q_SLOTS:
-    void onFinished();
-
-private:
-    OnlineAccountsClient::Setup m_setup;
-    bool m_isOpen;
-};
-
-Item::Item(const QVariantMap &staticData, QObject *parent):
-    ItemBase(staticData, parent),
-    m_isOpen(false)
-{
-    QObject::connect(&m_setup, SIGNAL(finished()),
-                     this, SLOT(onFinished()));
-}
-
-Item::~Item()
-{
-}
-
-QQmlComponent *Item::pageComponent(QQmlEngine *engine,
-                                   QObject *parent)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(parent);
-
-    if (!m_isOpen) {
-        qDebug() << "Opening Online Accounts";
-        m_isOpen = true;
-        m_setup.exec();
-    }
-    return 0;
-}
-
-void Item::onFinished()
-{
-    m_isOpen = false;
-}
-
-Plugin::Plugin():
-    QObject()
-{
-}
-
-ItemBase *Plugin::createItem(const QVariantMap &staticData,
-                             QObject *parent)
-{
-    return new Item(staticData, parent);
-}
-
-#include "plugin.moc"
+// #include "accounts.h"
+
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.OnlineAccounts"));
+
+    qDebug() << uri;
+    // qmlRegisterType<OnlineAccounts>(uri, 1, 0, "OnlineAccountsPanel");
+}
+
+void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    QQmlExtensionPlugin::initializeEngine(engine, uri);
+}

=== modified file 'system-settings-plugin/plugin.h'
--- system-settings-plugin/plugin.h	2013-09-09 10:56:53 +0000
+++ system-settings-plugin/plugin.h	2014-08-11 13:15:20 +0000
@@ -19,20 +19,17 @@
 #ifndef ONLINE_ACCOUNTS_SYSTEM_SETTINGS_PLUGIN_H
 #define ONLINE_ACCOUNTS_SYSTEM_SETTINGS_PLUGIN_H
 
-#include <QObject>
-#include <SystemSettings/PluginInterface>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
 
-class Plugin: public QObject, public SystemSettings::PluginInterface
+class BackendPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface")
-    Q_INTERFACES(SystemSettings::PluginInterface)
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    Plugin();
-
-    SystemSettings::ItemBase *createItem(const QVariantMap &staticData,
-                                         QObject *parent = 0);
+    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
 };
 
 #endif // ONLINE_ACCOUNTS_SYSTEM_SETTINGS_PLUGIN_H

=== modified file 'system-settings-plugin/system-settings-plugin.pro'
--- system-settings-plugin/system-settings-plugin.pro	2013-09-09 10:56:53 +0000
+++ system-settings-plugin/system-settings-plugin.pro	2014-08-11 13:15:20 +0000
@@ -4,6 +4,21 @@
 TEMPLATE = lib
 TARGET = online-accounts
 
+QML_SOURCES = \
+	AccountEditPage.qml \
+	AccountCreationPage.qml \
+	AuthorizationPage.qml \
+	NoAccountsPage.qml \
+	AccountItem.qml \
+	EntryComponent.qml \
+	NormalStartupPage.qml \
+	AccountsPage.qml \
+	MainPage.qml \
+	ProviderPluginList.qml \
+	AddAccountLabel.qml \
+	NewAccountPage.qml \
+	ProvidersList.qml
+
 CONFIG += \
     link_pkgconfig \
     plugin \
@@ -39,3 +54,6 @@
 image.path = $${PLUGIN_MANIFEST_DIR}/icons
 INSTALLS += image
 
+qml.files = $${QML_SOURCES}
+qml.path = $${PLUGIN_QML_DIR}/online-accounts
+INSTALLS += qml

=== added file 'tests/online-accounts-ui/data/com.ubuntu.tests_application.application'
--- tests/online-accounts-ui/data/com.ubuntu.tests_application.application	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/data/com.ubuntu.tests_application.application	2014-08-11 13:15:20 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<application id="com.ubuntu.tests_application">
+  <description>Mailer</description>
+  <translations>mailer-catalog</translations>
+  <desktop-entry>mailer.desktop</desktop-entry>
+
+  <service-types>
+    <service-type id="e-mail">
+      <description>Mailer can retrieve your e-mails</description>
+    </service-type>
+  </service-types>
+
+  <services>
+    <service id="coolshare">
+      <description>Mailer can even share stuff on CoolShare</description>
+    </service>
+  </services>
+	<profile>com.ubuntu.tests_application_0.3</profile>
+</application>

=== added file 'tests/online-accounts-ui/mock/notification-mock.cpp'
--- tests/online-accounts-ui/mock/notification-mock.cpp	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/mock/notification-mock.cpp	2014-08-11 13:15:20 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of online-accounts-ui
+ *
+ * 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 "notification-mock.h"
+
+#include <QByteArray>
+#include <QDebug>
+#include <QString>
+
+using namespace OnlineAccountsUi;
+
+QList<Notification*> NotificationPrivate::allNotifications;
+
+NotificationPrivate::NotificationPrivate(const QString &summary,
+                                         const QString &body,
+                                         Notification *notification):
+    QObject(notification),
+    m_summary(summary),
+    m_body(body),
+    q_ptr(notification)
+{
+    allNotifications.append(notification);
+}
+
+NotificationPrivate::~NotificationPrivate()
+{
+    allNotifications.removeAll(q_ptr);
+}
+
+void NotificationPrivate::invokeAction(const QString &action)
+{
+    Q_Q(Notification);
+    Q_EMIT q->actionInvoked(action);
+}
+
+Notification::Notification(const QString &summary,
+                           const QString &body,
+                           QObject *parent):
+    QObject(parent),
+    d_ptr(new NotificationPrivate(summary, body, this))
+{
+}
+
+Notification::~Notification()
+{
+}
+
+void Notification::addAction(const QString &action, const QString &label)
+{
+    Q_D(Notification);
+    d->m_actions.append(ActionPair(action, label));
+}
+
+void Notification::setSnapDecision(bool snapDecision)
+{
+    Q_D(Notification);
+    d->m_isSnapDecision = snapDecision;
+}
+
+void Notification::show()
+{
+    Q_D(Notification);
+    Q_EMIT d->showCalled();
+}

=== added file 'tests/online-accounts-ui/mock/notification-mock.h'
--- tests/online-accounts-ui/mock/notification-mock.h	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/mock/notification-mock.h	2014-08-11 13:15:20 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of online-accounts-ui
+ *
+ * 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 MOCK_NOTIFICATiON_H
+#define MOCK_NOTIFICATiON_H
+
+#include "notification.h"
+
+#include <QByteArray>
+#include <QList>
+#include <QPair>
+#include <QString>
+
+using namespace OnlineAccountsUi;
+
+namespace OnlineAccountsUi {
+
+typedef QPair<QString,QString> ActionPair;
+
+class NotificationPrivate: public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PUBLIC(Notification)
+
+public:
+    NotificationPrivate(const QString &summary,
+                        const QString &body,
+                        Notification *notification);
+    ~NotificationPrivate();
+    static NotificationPrivate *mocked(Notification *n) { return n->d_ptr; }
+
+    static QList<Notification *> allNotifications;
+
+    void invokeAction(const QString &action);
+
+Q_SIGNALS:
+    void showCalled();
+
+public:
+    QString m_summary;
+    QString m_body;
+    QList<ActionPair> m_actions;
+    bool m_isSnapDecision;
+    mutable Notification *q_ptr;
+};
+
+} // namespace
+
+#endif // MOCK_NOTIFICATiON_H

=== added file 'tests/online-accounts-ui/mock/request-mock.cpp'
--- tests/online-accounts-ui/mock/request-mock.cpp	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/mock/request-mock.cpp	2014-08-11 13:15:20 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of online-accounts-ui
+ *
+ * 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 "globals.h"
+#include "request-mock.h"
+
+#include <QDebug>
+
+using namespace OnlineAccountsUi;
+
+RequestPrivate::RequestPrivate(const QDBusConnection &connection,
+                               const QDBusMessage &message,
+                               const QVariantMap &parameters,
+                               Request *request):
+    QObject(request),
+    q_ptr(request),
+    m_parameters(parameters),
+    m_window(0),
+    m_inProgress(false)
+{
+    Q_UNUSED(connection);
+    Q_UNUSED(message);
+}
+
+RequestPrivate::~RequestPrivate()
+{
+}
+
+Request::Request(const QDBusConnection &connection,
+                 const QDBusMessage &message,
+                 const QVariantMap &parameters,
+                 QObject *parent):
+    QObject(parent),
+    d_ptr(new RequestPrivate(connection, message, parameters, this))
+{
+}
+
+Request::~Request()
+{
+}
+
+void Request::setWindow(QWindow *window)
+{
+    Q_D(Request);
+    Q_EMIT d->setWindowCalled(window);
+}
+
+WId Request::windowId() const
+{
+    Q_D(const Request);
+    return d->m_parameters[OAU_KEY_WINDOW_ID].toUInt();
+}
+
+bool Request::isInProgress() const
+{
+    Q_D(const Request);
+    return d->m_inProgress;
+}
+
+const QVariantMap &Request::parameters() const
+{
+    Q_D(const Request);
+    return d->m_parameters;
+}
+
+QString Request::clientApparmorProfile() const
+{
+    Q_D(const Request);
+    return d->m_clientApparmorProfile;
+}
+
+QWindow *Request::window() const
+{
+    Q_D(const Request);
+    return d->m_window;
+}
+
+void Request::start()
+{
+    Q_D(Request);
+    if (d->m_inProgress) {
+        qWarning() << "Request already started!";
+        return;
+    }
+    d->m_inProgress = true;
+}
+
+void Request::cancel()
+{
+    setCanceled();
+}
+
+void Request::fail(const QString &name, const QString &message)
+{
+    Q_D(Request);
+    Q_EMIT d->failCalled(name, message);
+
+    Q_EMIT completed();
+}
+
+void Request::setCanceled()
+{
+    Q_D(Request);
+    if (d->m_inProgress) {
+        fail(OAU_ERROR_USER_CANCELED, QStringLiteral("Canceled"));
+        d->m_inProgress = false;
+    }
+}
+
+void Request::setResult(const QVariantMap &result)
+{
+    Q_D(Request);
+    if (d->m_inProgress) {
+        Q_EMIT d->setResultCalled(result);
+
+        Q_EMIT completed();
+        d->m_inProgress = false;
+    }
+}

=== added file 'tests/online-accounts-ui/mock/request-mock.h'
--- tests/online-accounts-ui/mock/request-mock.h	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/mock/request-mock.h	2014-08-11 13:15:20 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of online-accounts-ui
+ *
+ * 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 MOCK_REQUEST_H
+#define MOCK_REQUEST_H
+
+#include "request.h"
+
+#include <QObject>
+#include <QString>
+#include <QVariantMap>
+
+namespace OnlineAccountsUi {
+
+class RequestPrivate: public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PUBLIC(Request)
+
+public:
+    RequestPrivate(const QDBusConnection &connection,
+                   const QDBusMessage &message,
+                   const QVariantMap &parameters,
+                   Request *request);
+    ~RequestPrivate();
+    static RequestPrivate *mocked(Request *r) { return r->d_ptr; }
+
+    void setClientApparmorProfile(const QString &profile) {
+        m_clientApparmorProfile = profile;
+    }
+
+Q_SIGNALS:
+    void setWindowCalled(QWindow *);
+    void failCalled(const QString &name, const QString &message);
+    void setResultCalled(const QVariantMap &result);
+
+private:
+    mutable Request *q_ptr;
+    QVariantMap m_parameters;
+    QString m_clientApparmorProfile;
+    QWindow *m_window;
+    bool m_inProgress;
+};
+
+} // namespace
+
+#endif // MOCK_REQUEST_H

=== modified file 'tests/online-accounts-ui/online-accounts-ui.pro'
--- tests/online-accounts-ui/online-accounts-ui.pro	2014-06-05 13:28:30 +0000
+++ tests/online-accounts-ui/online-accounts-ui.pro	2014-08-11 13:15:20 +0000
@@ -5,4 +5,5 @@
     tst_application_manager.pro \
     tst_inactivity_timer.pro \
     tst_notification.pro \
-    tst_service.pro
+    tst_service.pro \
+    tst_signonui_request.pro

=== modified file 'tests/online-accounts-ui/tst_notification.cpp'
--- tests/online-accounts-ui/tst_notification.cpp	2014-06-05 13:28:30 +0000
+++ tests/online-accounts-ui/tst_notification.cpp	2014-08-11 13:15:20 +0000
@@ -26,6 +26,7 @@
 #include <QPair>
 #include <QSignalSpy>
 #include <QTest>
+#include <QVariantMap>
 #include <libnotify/notification.h>
 #include <libnotify/notify.h>
 
@@ -52,6 +53,7 @@
     QString summary;
     QString body;
     QList<ActionPair> actions;
+    QVariantMap hints;
     bool visible;
 
     MockNotification();
@@ -167,6 +169,22 @@
     callbackData.userData = user_data;
 }
 
+void notify_notification_set_hint(NotifyNotification *notification,
+                                  const char *key,
+                                  GVariant *value)
+{
+    MockNotification *mock =
+        reinterpret_cast<MockNotification*>(notification);
+    QVariant variant;
+    if (g_variant_is_of_type(value, G_VARIANT_TYPE_BOOLEAN)) {
+        variant = bool(g_variant_get_boolean(value));
+    } else {
+        /* Add support for any needed types */
+        qWarning() << "Unsupported variant type";
+    }
+    mock->hints.insert(QString::fromUtf8(key), variant);
+}
+
 /* End of mock code */
 
 class NotificationTest: public QObject
@@ -180,6 +198,7 @@
     void testInitialization();
     void testDestruction();
     void testContents();
+    void testSnapDecision();
     void testVisibility();
     void testClosing();
     void testActions();
@@ -220,6 +239,20 @@
     MockNotification *mock = *(notifications.begin());
     QCOMPARE(mock->summary, QString("Summary"));
     QCOMPARE(mock->body, QString("Body"));
+    QVERIFY(mock->hints.isEmpty());
+}
+
+void NotificationTest::testSnapDecision()
+{
+    Notification first("Summary", "Body");
+    MockNotification *mock = *(notifications.begin());
+    QVERIFY(mock->hints.isEmpty());
+
+    first.setSnapDecision(true);
+    QCOMPARE(mock->hints["x-canonical-snap-decisions"].toBool(), true);
+
+    first.setSnapDecision(false);
+    QCOMPARE(mock->hints["x-canonical-snap-decisions"].toBool(), false);
 }
 
 void NotificationTest::testVisibility()

=== added file 'tests/online-accounts-ui/tst_signonui_request.cpp'
--- tests/online-accounts-ui/tst_signonui_request.cpp	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/tst_signonui_request.cpp	2014-08-11 13:15:20 +0000
@@ -0,0 +1,338 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of online-accounts-ui
+ *
+ * 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 "globals.h"
+#include "request-handler.h"
+#include "signonui-request.h"
+#include "mock/notification-mock.h"
+#include "mock/request-mock.h"
+
+#include <Accounts/Account>
+#include <Accounts/Manager>
+
+#include <QDebug>
+#include <QSignalSpy>
+#include <QTemporaryDir>
+#include <QTest>
+
+#include <SignOn/uisessiondata.h>
+#include <SignOn/uisessiondata_priv.h>
+
+using namespace OnlineAccountsUi;
+
+class TestRequest: public SignOnUi::Request
+{
+    Q_OBJECT
+
+public:
+    TestRequest(const QDBusConnection &connection,
+                const QDBusMessage &message,
+                const QVariantMap &parameters,
+                QObject *parent = 0):
+        Request(connection, message, parameters, parent)
+    {
+    }
+
+    void setWindow(QWindow *window) { Request::setWindow(window); }
+
+    void sendResult(const QVariantMap &result) { setResult(result); }
+};
+
+class SignonuiRequestTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    SignonuiRequestTest();
+
+private Q_SLOTS:
+    void initTestCase();
+    void testParameters_data();
+    void testParameters();
+    void testHandler();
+    void testSnapDecision_data();
+    void testSnapDecision();
+
+private:
+    bool mustCreateAccount(uint credentialsId) { return credentialsId > 10; }
+
+private:
+    QDBusConnection m_connection;
+    QDBusMessage m_message;
+    QTemporaryDir m_accountsDir;
+};
+
+SignonuiRequestTest::SignonuiRequestTest():
+    QObject(),
+    m_connection(QStringLiteral("uninitialized"))
+{
+}
+
+void SignonuiRequestTest::initTestCase()
+{
+    QVERIFY(m_accountsDir.isValid());
+
+    qputenv("ACCOUNTS", m_accountsDir.path().toUtf8());
+    qputenv("AG_APPLICATIONS", TEST_DATA_DIR);
+    qputenv("AG_PROVIDERS", TEST_DATA_DIR);
+    qputenv("AG_SERVICES", TEST_DATA_DIR);
+    qputenv("XDG_DATA_HOME", TEST_DATA_DIR);
+}
+
+void SignonuiRequestTest::testParameters_data()
+{
+    QTest::addColumn<QVariantMap>("parameters");
+    QTest::addColumn<uint>("identity");
+    QTest::addColumn<QString>("method");
+    QTest::addColumn<QString>("mechanism");
+    QTest::addColumn<QString>("id");
+    QTest::addColumn<QVariantMap>("clientData");
+
+    QTest::newRow("empty") <<
+        QVariantMap() <<
+        uint(0) <<
+        QString() <<
+        QString() <<
+        QString() <<
+        QVariantMap();
+
+    QVariantMap clientData;
+    clientData.insert("some number", 4);
+
+    QVariantMap parameters;
+    parameters.insert(SSOUI_KEY_CLIENT_DATA, clientData);
+    parameters.insert(SSOUI_KEY_IDENTITY, uint(45));
+    parameters.insert(SSOUI_KEY_METHOD, QString("a method"));
+    parameters.insert(SSOUI_KEY_MECHANISM, QString("a mechanism"));
+    parameters.insert(SSOUI_KEY_REQUESTID, QString("/id-4"));
+
+
+    QTest::newRow("basic") <<
+        parameters <<
+        uint(45) <<
+        "a method" <<
+        "a mechanism" <<
+        "/id-4" <<
+        clientData;
+}
+
+void SignonuiRequestTest::testParameters()
+{
+    QFETCH(QVariantMap, parameters);
+    QFETCH(QString, method);
+    QFETCH(QString, mechanism);
+    QFETCH(QString, id);
+    QFETCH(QVariantMap, clientData);
+
+    TestRequest request(m_connection, m_message, parameters);
+    QCOMPARE(request.method(), method);
+    QCOMPARE(request.mechanism(), mechanism);
+    QCOMPARE(request.id(), id);
+    QCOMPARE(request.clientData(), clientData);
+}
+
+void SignonuiRequestTest::testHandler()
+{
+    QVariantMap parameters;
+    TestRequest request(m_connection, m_message, parameters);
+    QVERIFY(request.handler() == 0);
+
+    SignOnUi::RequestHandler *handler = new SignOnUi::RequestHandler;
+    request.setHandler(handler);
+    QCOMPARE(request.handler(), handler);
+
+    /* Try to set another handler; this won't be allowed */
+    SignOnUi::RequestHandler *handler2 = new SignOnUi::RequestHandler;
+    request.setHandler(handler2);
+    QCOMPARE(request.handler(), handler);
+
+    delete handler2;
+    delete handler;
+}
+
+void SignonuiRequestTest::testSnapDecision_data()
+{
+    QTest::addColumn<uint>("credentialsId");
+    QTest::addColumn<QString>("accountName");
+    QTest::addColumn<QString>("clientProfile");
+    QTest::addColumn<QString>("applicationName");
+    QTest::addColumn<bool>("mustAccept");
+    QTest::addColumn<QVariantMap>("result");
+
+    QVariantMap acceptedResult;
+    acceptedResult.insert("some key", QString("some value"));
+
+    QVariantMap declinedResult;
+    declinedResult.insert(SSOUI_KEY_ERROR, SignOn::QUERY_ERROR_CANCELED);
+
+    QVariantMap errorResult;
+    errorResult.insert(SSOUI_KEY_ERROR, SignOn::QUERY_ERROR_FORBIDDEN);
+
+    QTest::newRow("no account") <<
+        uint(0) <<
+        "[e-mail]" <<
+        "com.ubuntu.tests_application_0.3" <<
+        QString() <<
+        false <<
+        errorResult;
+
+    QTest::newRow("invalid account") <<
+        uint(1) <<
+        "[e-mail]" <<
+        "com.ubuntu.tests_application_0.3" <<
+        QString() <<
+        false <<
+        errorResult;
+
+    QTest::newRow("valid application, accepted") <<
+        uint(14231) <<
+        "[e-mail]" <<
+        "com.ubuntu.tests_application_0.3" <<
+        "Easy Mailer" <<
+        true <<
+        acceptedResult;
+
+    QTest::newRow("valid application, declined") <<
+        uint(14231) <<
+        "[e-mail]" <<
+        "com.ubuntu.tests_application_0.3" <<
+        "Easy Mailer" <<
+        false <<
+        declinedResult;
+
+    QTest::newRow("unconfined application, accepted") <<
+        uint(14235) <<
+        "[e-mail]" <<
+        "unconfined" <<
+        "Ubuntu" <<
+        true <<
+        acceptedResult;
+
+    QTest::newRow("unconfined application, declined") <<
+        uint(14235) <<
+        "[e-mail]" <<
+        "unconfined" <<
+        "Ubuntu" <<
+        false <<
+        declinedResult;
+}
+
+void SignonuiRequestTest::testSnapDecision()
+{
+    QString providerId("cool");
+    QFETCH(uint, credentialsId);
+    QFETCH(QString, accountName);
+    QFETCH(QString, clientProfile);
+    QFETCH(QString, applicationName);
+    QFETCH(bool, mustAccept);
+    QFETCH(QVariantMap, result);
+
+    // First, create an account
+    Accounts::Manager *manager = new Accounts::Manager(this);
+    Accounts::Provider provider = manager->provider(providerId);
+    QVERIFY(provider.isValid());
+    if (mustCreateAccount(credentialsId)) {
+        Accounts::Account *account = manager->createAccount(providerId);
+        QVERIFY(account != 0);
+        account->setEnabled(true);
+        account->setDisplayName(accountName);
+        account->setCredentialsId(credentialsId);
+        account->syncAndBlock();
+    }
+
+    /* Then, create a request referring to the same credentials ID of the
+     * created account. */
+    QVariantMap parameters;
+    parameters.insert(SSOUI_KEY_IDENTITY, credentialsId);
+    parameters.insert(SSOUI_KEY_METHOD, "funnyMethod");
+    parameters.insert(SSOUI_KEY_MECHANISM, "funnyMechanism");
+    TestRequest request(m_connection, m_message, parameters);
+    OnlineAccountsUi::RequestPrivate *mockRequest =
+        OnlineAccountsUi::RequestPrivate::mocked(&request);
+    QSignalSpy failCalled(mockRequest,
+                          SIGNAL(failCalled(const QString&, const QString&)));
+    QSignalSpy setResultCalled(mockRequest,
+                               SIGNAL(setResultCalled(const QVariantMap &)));
+    mockRequest->setClientApparmorProfile(clientProfile);
+    request.start();
+
+    /* Request to show a window; a snap decision should appear instead */
+    QWindow *window = new QWindow;
+    QSignalSpy setWindowCalled(mockRequest,
+                               SIGNAL(setWindowCalled(QWindow*)));
+    request.setWindow(window);
+    QCOMPARE(setWindowCalled.count(), 0);
+    if (mustCreateAccount(credentialsId)) {
+        QCOMPARE(NotificationPrivate::allNotifications.count(), 1);
+    } else {
+        /* If the account is not found, no notification should appear, and an
+         * error returned to the app */
+        QCOMPARE(NotificationPrivate::allNotifications.count(), 0);
+        QCOMPARE(setResultCalled.count(), 1);
+        QCOMPARE(setResultCalled.at(0).at(0).toMap(), result);
+        return;
+    }
+
+    /* Inspect the snap decision contents */
+    Notification *notification =
+        NotificationPrivate::allNotifications.first();
+    NotificationPrivate *mockNotification =
+        NotificationPrivate::mocked(notification);
+    QCOMPARE(mockNotification->m_summary, QString("Authentication request"));
+    QCOMPARE(mockNotification->m_body,
+             QString("Please authorize %1 to access your %2 account %3").
+             arg(applicationName).arg(provider.displayName()).arg(accountName));
+    QVERIFY(mockNotification->m_isSnapDecision);
+
+    /* Invoke the action on the snap decision */
+    QString action = mustAccept ? "continue" : "cancel";
+    QSignalSpy actionInvoked(notification,
+                             SIGNAL(actionInvoked(const QString &)));
+    mockNotification->invokeAction(action);
+    QCOMPARE(actionInvoked.count(), 1);
+    QCOMPARE(actionInvoked.at(0).at(0).toString(), action);
+
+    /* Here we iterate the main loop because the notification object is
+     * destroyed with deleteLater() */
+    QTest::qWait(5);
+
+    if (mustAccept) {
+        QCOMPARE(setWindowCalled.count(), 1);
+        QCOMPARE(setWindowCalled.at(0).at(0), QVariant::fromValue(window));
+        QCOMPARE(failCalled.count(), 0);
+        QCOMPARE(setResultCalled.count(), 0);
+
+        /* deliver the result */
+        request.sendResult(result);
+        QCOMPARE(setResultCalled.count(), 1);
+        QCOMPARE(setResultCalled.at(0).at(0).toMap(), result);
+    } else {
+        QCOMPARE(setWindowCalled.count(), 0);
+        QCOMPARE(failCalled.count(), 0);
+        QCOMPARE(setResultCalled.count(), 1);
+        QCOMPARE(setResultCalled.at(0).at(0).toMap(), result);
+    }
+    delete window;
+    delete manager;
+}
+
+QTEST_MAIN(SignonuiRequestTest);
+
+#include "tst_signonui_request.moc"

=== added file 'tests/online-accounts-ui/tst_signonui_request.pro'
--- tests/online-accounts-ui/tst_signonui_request.pro	1970-01-01 00:00:00 +0000
+++ tests/online-accounts-ui/tst_signonui_request.pro	2014-08-11 13:15:20 +0000
@@ -0,0 +1,53 @@
+include(../../common-project-config.pri)
+
+TARGET = tst_signonui_request
+
+CONFIG += \
+    debug \
+    link_pkgconfig
+
+QT += \
+    core \
+    dbus \
+    testlib
+
+PKGCONFIG += \
+    accounts-qt5 \
+    libsignon-qt5 \
+    signon-plugins-common
+
+DEFINES += \
+    DEBUG_ENABLED \
+    NO_REQUEST_FACTORY \
+    TEST_DATA_DIR=\\\"$${PWD}/data\\\"
+
+SRCDIR = $${TOP_SRC_DIR}/src
+
+SOURCES += \
+    $${SRCDIR}/account-manager.cpp \
+    $${SRCDIR}/application-manager.cpp \
+    $${SRCDIR}/debug.cpp \
+    $${SRCDIR}/request-handler.cpp \
+    $${SRCDIR}/signonui-request.cpp \
+    mock/notification-mock.cpp \
+    mock/request-mock.cpp \
+    mock/qwindow.cpp \
+    tst_signonui_request.cpp
+
+HEADERS += \
+    $${SRCDIR}/account-manager.h \
+    $${SRCDIR}/application-manager.h \
+    $${SRCDIR}/notification.h \
+    $${SRCDIR}/request.h \
+    $${SRCDIR}/request-handler.h \
+    $${SRCDIR}/signonui-request.h \
+    mock/notification-mock.h \
+    mock/request-mock.h \
+    window-watcher.h
+
+INCLUDEPATH += \
+    $${SRCDIR}
+
+check.commands = "xvfb-run -s '-screen 0 640x480x24' -a dbus-test-runner -t ./$${TARGET}"
+check.depends = $${TARGET}
+QMAKE_EXTRA_TARGETS += check