Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1380914-rtm into lp:ubuntu-system-settings-online-accounts/rtm-14.09

[Alberto Mardegan]

Use trusted prompts for SignOnUi

Use trusted prompts for SignOnUi

[David Barth (dbarth)]

review: Approve

=== modified file 'online-accounts-service/request-manager.cpp'
--- online-accounts-service/request-manager.cpp	2014-08-19 09:34:33 +0000
+++ online-accounts-service/request-manager.cpp	2015-01-15 14:04:34 +0000
@@ -117,9 +117,7 @@
         return; // Nothing to do
     }
 
-    pid_t clientPid = (request->interface() == OAU_INTERFACE) ?
-        request->parameters().value(OAU_KEY_PID, 0).toUInt() : 0;
-    UiProxy *proxy = new UiProxy(clientPid, this);
+    UiProxy *proxy = new UiProxy(request->clientPid(), this);
     if (Q_UNLIKELY(!proxy->init())) {
         qWarning() << "UiProxy initialization failed!";
         runQueue(queue);

=== modified file 'online-accounts-service/request.cpp'
--- online-accounts-service/request.cpp	2014-11-28 10:23:47 +0000
+++ online-accounts-service/request.cpp	2015-01-15 14:04:34 +0000
@@ -22,6 +22,8 @@
 #include "globals.h"
 #include "request.h"
 
+#include <SignOn/uisessiondata_priv.h>
+
 using namespace OnlineAccountsUi;
 
 static bool mapIsSuperset(const QVariantMap &test, const QVariantMap &set)
@@ -149,6 +151,18 @@
     return d->windowId();
 }
 
+pid_t Request::clientPid() const
+{
+    Q_D(const Request);
+    if (interface() == OAU_INTERFACE) {
+        return d->m_parameters.value(OAU_KEY_PID, 0).toUInt();
+    } else if (interface() == SIGNONUI_INTERFACE) {
+        return d->m_parameters.value(SSOUI_KEY_PID, 0).toUInt();
+    }
+
+    return 0;
+}
+
 void Request::setInProgress(bool inProgress)
 {
     Q_D(Request);

=== modified file 'online-accounts-service/request.h'
--- online-accounts-service/request.h	2014-11-28 10:23:47 +0000
+++ online-accounts-service/request.h	2015-01-15 14:04:34 +0000
@@ -43,6 +43,7 @@
     static Request *find(const QVariantMap &match);
 
     quint64 windowId() const;
+    pid_t clientPid() const;
     void setInProgress(bool inProgress);
     bool isInProgress() const;
     const QVariantMap &parameters() const;

=== modified file 'online-accounts-ui/signonui-request.cpp'
--- online-accounts-ui/signonui-request.cpp	2014-10-10 12:29:38 +0000
+++ online-accounts-ui/signonui-request.cpp	2015-01-15 14:04:34 +0000
@@ -275,7 +275,9 @@
      * 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) {
+    if (window == d->m_window ||
+        /* If we are part of a prompt session, just show the window */
+        !qgetenv("MIR_SOCKET").isEmpty()) {
         OnlineAccountsUi::Request::setWindow(window);
         d->m_window = 0;
     } else {

=== modified file 'tests/online-accounts-service/tst_service.pro'
--- tests/online-accounts-service/tst_service.pro	2014-08-08 11:37:56 +0000
+++ tests/online-accounts-service/tst_service.pro	2015-01-15 14:04:34 +0000
@@ -3,13 +3,17 @@
 TARGET = tst_service
 
 CONFIG += \
-    debug
+    debug \
+    link_pkgconfig
 
 QT += \
     core \
     dbus \
     testlib
 
+PKGCONFIG += \
+    signon-plugins-common
+
 DEFINES += \
     NO_REQUEST_FACTORY