Merge lp:~mzanetti/unity8/async-dashcommunicator into lp:unity8

[Michael Zanetti]

Make the DashCommunicator async and more flexible to handle a lifecycle-suspended dash

* Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~unity-team/qtmir/fix-some-lifecycle-bugs/+merge/234087
https://code.launchpad.net/~mzanetti/unity-api/dashActive/+merge/235273

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yip yip

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

nope

 * If you changed the UI, has there been a design review?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1268
http://jenkins.qa.ubuntu.com/job/unity8-ci/4353/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4998/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1354/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1447/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1447/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6250/console

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/async-dashcommunicator]

1269. By Michael Zanetti on 2014-09-19

make it compile

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1269
http://jenkins.qa.ubuntu.com/job/unity8-ci/4358/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5007/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1452/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1452/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6259/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

I think it would be better to only try creating a DBus connection when that DBus instance appears on the bus. I have code doing that working here:
lp:~gerboland/unity8/dbus-async
Welcome to take it

It would also yield code that doesn't depend on AppManager, which I think would be a win here.

review: Needs Fixing

[Gerry Boland (gerboland)]

I understand now that my branch does not solve all the problems that you are dealing with here - mainly that is the service is SIGSTOPPed, creating a QDbusInterface for it blocks until dbus times out.

Perhaps putting the creation of the QDbusInterface in a separate thread would solve all the issues

[lp:~mzanetti/unity8/async-dashcommunicator]

1270. By Michael Zanetti on 2014-09-24

merge Gerry's proposal and make it threaded

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1270
http://jenkins.qa.ubuntu.com/job/unity8-ci/4389/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1390/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1483/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1483/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6383/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

+ print("*******************************++ dbus call")
oops :)

[lp:~mzanetti/unity8/async-dashcommunicator]

1271. By Michael Zanetti on 2014-09-24

make it threaded

1272. By Michael Zanetti on 2014-09-24

add missing files, drop debug print

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1272
http://jenkins.qa.ubuntu.com/job/unity8-ci/4393/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5153/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1394/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1487/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1487/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6405/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

+void DashConnection::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)
+{
+ dbusInterface()->asyncCall("SetCurrentScope", scopeId, animate, isSwipe);
+}
dbusInterface() could return null if the service isn't available, you should check for that. Am happy to drop calls if service not available

review: Needs Fixing

[lp:~mzanetti/unity8/async-dashcommunicator]

1273. By Michael Zanetti on 2014-09-29

check for a valid interface connection

[Albert Astals Cid (aacid)]

if (m_dbusInterface) {
    delete m_dbusInterface;
}

You can just remove the if.

review: Needs Fixing

[lp:~mzanetti/unity8/async-dashcommunicator]

1274. By Michael Zanetti on 2014-09-29

merge/update

1275. By Michael Zanetti on 2014-09-29

dashActive -> forceDashActive

[Michael Zanetti (mzanetti)]

> +void DashConnection::setCurrentScope(const QString &scopeId, bool animate,
> bool isSwipe)
> +{
> + dbusInterface()->asyncCall("SetCurrentScope", scopeId, animate, isSwipe);
> +}
> dbusInterface() could return null if the service isn't available, you should
> check for that. Am happy to drop calls if service not available

done

[lp:~mzanetti/unity8/async-dashcommunicator]

1276. By Michael Zanetti on 2014-09-29

minor tweak from review comment

[Michael Zanetti (mzanetti)]

> if (m_dbusInterface) {
> delete m_dbusInterface;
> }
>
> You can just remove the if.

done

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1273
http://jenkins.qa.ubuntu.com/job/unity8-ci/4422/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5266/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1516/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1516/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6518/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1276
http://jenkins.qa.ubuntu.com/job/unity8-ci/4423/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1419/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1517/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1517/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6520/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Looks good from a code pov, need to test it in the device

[lp:~mzanetti/unity8/async-dashcommunicator]

1277. By Michael Zanetti on 2014-09-29

update the launcher tests mock appman backend

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1277
http://jenkins.qa.ubuntu.com/job/unity8-ci/4428/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5281/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1424/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1522/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1522/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6533/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
I did

* Did CI run pass? If not, please explain why.
No, requires new unity-api from a different branch

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-23 06:54:10 +0000
+++ CMakeLists.txt	2014-09-29 14:27:27 +0000
@@ -64,13 +64,13 @@
     message(FATAL_ERROR "Could not determine plugin installation dir.")
 endif()
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+
 execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir unity-shell-api OUTPUT_VARIABLE SHELL_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 if(SHELL_PLUGINDIR STREQUAL "")
     message(FATAL_ERROR "Could not determine plugin import dir.")
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
 
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")

=== modified file 'debian/control'
--- debian/control	2014-09-26 19:12:24 +0000
+++ debian/control	2014-09-29 14:27:27 +0000
@@ -25,7 +25,7 @@
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.8),
                libqt5xmlpatterns5-dev,
-               libunity-api-dev (>= 7.91),
+               libunity-api-dev (>= 7.92),
                libusermetricsoutput1-dev,
                libxcb1-dev,
                pkg-config,

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2014-07-29 16:18:49 +0000
+++ debian/unity8-private.install	2014-09-29 14:27:27 +0000
@@ -1,3 +1,4 @@
+usr/lib/*/libunity8-private.*
 usr/lib/*/unity8/qml/AccountsService
 usr/lib/*/unity8/qml/Dash
 usr/lib/*/unity8/qml/HudClient

=== modified file 'plugins/LightDM/DBusGreeter.h'
--- plugins/LightDM/DBusGreeter.h	2014-08-27 15:11:21 +0000
+++ plugins/LightDM/DBusGreeter.h	2014-09-29 14:27:27 +0000
@@ -21,7 +21,6 @@
 #include <QObject>
 
 class Greeter;
-class QDBusInterface;
 
 /** This is an internal class used to talk with the indicators.
   */

=== modified file 'plugins/LightDM/DBusGreeterList.h'
--- plugins/LightDM/DBusGreeterList.h	2013-12-03 16:55:03 +0000
+++ plugins/LightDM/DBusGreeterList.h	2014-09-29 14:27:27 +0000
@@ -21,7 +21,6 @@
 #include <QObject>
 
 class Greeter;
-class QDBusInterface;
 
 /** This is an internal class used to talk with the indicators.
   */

=== modified file 'plugins/Unity/DashCommunicator/CMakeLists.txt'
--- plugins/Unity/DashCommunicator/CMakeLists.txt	2014-07-24 16:02:27 +0000
+++ plugins/Unity/DashCommunicator/CMakeLists.txt	2014-09-29 14:27:27 +0000
@@ -1,5 +1,6 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${libunity8-private_SOURCE_DIR}
 )
 
 set(QMLDASHCOMMUNICATORPLUGIN_SRC
@@ -7,13 +8,18 @@
     dbusdashcommunicatorservice.cpp
     dashcommunicatorservice.cpp
     dashcommunicator.cpp
-    )
+    dashconnection.cpp
+)
 
 add_library(DashCommunicator-qml MODULE
     ${QMLDASHCOMMUNICATORPLUGIN_SRC}
-    )
+)
 
 qt5_use_modules(DashCommunicator-qml DBus Qml)
 
+target_link_libraries(DashCommunicator-qml
+    unity8-private
+)
+
 # export the qmldir and qmltypes files
 add_unity8_plugin(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS DashCommunicator-qml)

=== modified file 'plugins/Unity/DashCommunicator/dashcommunicator.cpp'
--- plugins/Unity/DashCommunicator/dashcommunicator.cpp	2014-09-02 10:14:23 +0000
+++ plugins/Unity/DashCommunicator/dashcommunicator.cpp	2014-09-29 14:27:27 +0000
@@ -15,29 +15,38 @@
  */
 
 #include "dashcommunicator.h"
+#include "dashconnection.h"
 
 #include <QObject>
-#include <QDBusConnection>
-#include <QDBusInterface>
-#include <QDebug>
 
 DashCommunicator::DashCommunicator(QObject *parent):
-    QObject(parent)
-{
-}
-
-DashCommunicator::~DashCommunicator()
-{
-}
-
+    QThread(parent),
+    m_dashConnection(nullptr),
+    m_created(false)
+{
+    start();
+}
 
 void DashCommunicator::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)
 {
-    QDBusConnection connection = QDBusConnection::sessionBus();
-    QDBusInterface dashIface ("com.canonical.UnityDash",
-                           "/com/canonical/UnityDash",
-                           "",
-                           connection);
-
-    dashIface.call("SetCurrentScope", scopeId, animate, isSwipe);
+    m_mutex.lock();
+    if (m_created) {
+        QMetaObject::invokeMethod(m_dashConnection, "setCurrentScope",
+                                  Q_ARG(QString, scopeId),
+                                  Q_ARG(bool, animate),
+                                  Q_ARG(bool, isSwipe));
+    }
+    m_mutex.unlock();
+}
+
+void DashCommunicator::run()
+{
+    m_dashConnection = new DashConnection("com.canonical.UnityDash",
+                                 "/com/canonical/UnityDash",
+                                 "", this);
+    m_mutex.lock();
+    m_created = true;
+    m_mutex.unlock();
+
+    exec();
 }

=== modified file 'plugins/Unity/DashCommunicator/dashcommunicator.h'
--- plugins/Unity/DashCommunicator/dashcommunicator.h	2014-09-02 10:14:23 +0000
+++ plugins/Unity/DashCommunicator/dashcommunicator.h	2014-09-29 14:27:27 +0000
@@ -17,19 +17,29 @@
 #ifndef DASHCOMMUNICATOR_H
 #define DASHCOMMUNICATOR_H
 
-#include <QObject>
-
-class DashCommunicator: public QObject
+// Qt
+#include <QThread>
+#include <QMutex>
+
+class DashConnection;
+
+class DashCommunicator: public QThread
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")
-
 public:
-    DashCommunicator(QObject *parent = 0);
-    ~DashCommunicator();
+    explicit DashCommunicator(QObject *parent = 0);
+    ~DashCommunicator() = default;
 
 public Q_SLOTS:
     void setCurrentScope(const QString &scopeId, bool animate, bool isSwipe);
+
+protected:
+    void run() override;
+
+private:
+    DashConnection *m_dashConnection;
+    bool m_created;
+    QMutex m_mutex;
 };
 
 #endif

=== added file 'plugins/Unity/DashCommunicator/dashconnection.cpp'
--- plugins/Unity/DashCommunicator/dashconnection.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/DashCommunicator/dashconnection.cpp	2014-09-29 14:27:27 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "dashconnection.h"
+
+#include <QDBusInterface>
+#include <QDBusPendingCall>
+
+DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):
+    AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)
+{
+
+}
+
+void DashConnection::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)
+{
+    if (dbusInterface()) {
+        dbusInterface()->asyncCall("SetCurrentScope", scopeId, animate, isSwipe);
+    }
+}

=== added file 'plugins/Unity/DashCommunicator/dashconnection.h'
--- plugins/Unity/DashCommunicator/dashconnection.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/DashCommunicator/dashconnection.h	2014-09-29 14:27:27 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef THREADEDDASHCONNECTION_H
+#define THREADEDDASHCONNECTION_H
+
+// local
+#include "abstractdbusservicemonitor.h"
+
+
+class DashConnection: public AbstractDBusServiceMonitor
+{
+    Q_OBJECT
+public:
+    DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent = 0);
+
+public Q_SLOTS:
+    void setCurrentScope(const QString &scopeId, bool animate, bool isSwipe);
+};
+
+#endif

=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
--- plugins/Unity/Launcher/CMakeLists.txt	2014-09-19 11:20:07 +0000
+++ plugins/Unity/Launcher/CMakeLists.txt	2014-09-29 14:27:27 +0000
@@ -1,6 +1,6 @@
 include(FindPkgConfig)
 pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 
 add_definitions(-DSM_BUSNAME=systemBus)

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-09-22 18:24:43 +0000
+++ qml/Shell.qml	2014-09-29 14:27:27 +0000
@@ -128,6 +128,13 @@
         objectName: "dashCommunicator"
     }
 
+    Binding {
+        target: ApplicationManager
+        property: "forceDashActive"
+        value: launcher.shown || launcher.dashSwipe
+    }
+
+
     WindowKeysFilter {
         // Handle but do not filter out volume keys
         Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-07-23 06:54:10 +0000
+++ src/CMakeLists.txt	2014-09-29 14:27:27 +0000
@@ -36,3 +36,4 @@
 
 add_subdirectory(Panel)
 add_subdirectory(Dash)
+add_subdirectory(libunity8-private)

=== modified file 'src/Dash/CMakeLists.txt'
--- src/Dash/CMakeLists.txt	2014-09-04 13:15:13 +0000
+++ src/Dash/CMakeLists.txt	2014-09-29 14:27:27 +0000
@@ -9,6 +9,8 @@
 
 qt5_use_modules(unity8-dash Gui Qml Quick Test)
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+
 # install binaries
 install(TARGETS ${DASH_APP}
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

=== modified file 'src/Panel/CMakeLists.txt'
--- src/Panel/CMakeLists.txt	2013-06-18 18:02:29 +0000
+++ src/Panel/CMakeLists.txt	2014-09-29 14:27:27 +0000
@@ -1,1 +1,3 @@
 add_subdirectory(Indicators)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

=== added directory 'src/libunity8-private'
=== added file 'src/libunity8-private/CMakeLists.txt'
--- src/libunity8-private/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/libunity8-private/CMakeLists.txt	2014-09-29 14:27:27 +0000
@@ -0,0 +1,25 @@
+set(LIB_NAME "unity8-private")
+set(SOVERSION 0)
+set(VERSION ${SOVERSION}.0.0)
+
+project(lib${LIB_NAME})
+
+set(lib${LIB_NAME}_SRCS
+    abstractdbusservicemonitor.cpp
+    )
+
+add_library(${LIB_NAME} SHARED
+    ${lib${LIB_NAME}_SRCS}
+    )
+
+set_target_properties(${LIB_NAME} PROPERTIES
+    VERSION ${VERSION}
+    SOVERSION ${SOVERSION}
+    )
+
+qt5_use_modules(${LIB_NAME} DBus)
+
+# install library
+install(TARGETS ${LIB_NAME}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    )

=== added file 'src/libunity8-private/abstractdbusservicemonitor.cpp'
--- src/libunity8-private/abstractdbusservicemonitor.cpp	1970-01-01 00:00:00 +0000
+++ src/libunity8-private/abstractdbusservicemonitor.cpp	2014-09-29 14:27:27 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2011-2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Ugo Riboni <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#include "abstractdbusservicemonitor.h"
+
+#include <QDBusInterface>
+#include <QDBusServiceWatcher>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusReply>
+
+AbstractDBusServiceMonitor::AbstractDBusServiceMonitor(const QString &service, const QString &path,
+                                                       const QString &interface, const Bus bus,
+                                                       QObject *parent)
+    : QObject(parent)
+    , m_service(service)
+    , m_path(path)
+    , m_interface(interface)
+    , m_watcher(new QDBusServiceWatcher(service,
+                                        (bus == SystemBus) ? QDBusConnection::systemBus()
+                                                           : QDBusConnection::sessionBus()))
+    , m_dbusInterface(nullptr)
+{
+    connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &AbstractDBusServiceMonitor::createInterface);
+    connect(m_watcher, &QDBusServiceWatcher::serviceUnregistered, this, &AbstractDBusServiceMonitor::destroyInterface);
+
+    // Connect to the service if it's up already
+    QDBusConnectionInterface* sessionBus = QDBusConnection::sessionBus().interface();
+    QDBusReply<bool> reply = sessionBus->isServiceRegistered(m_service);
+    if (reply.isValid() && reply.value()) {
+        createInterface(m_service);
+    }
+}
+
+AbstractDBusServiceMonitor::~AbstractDBusServiceMonitor()
+{
+    delete m_watcher;
+    delete m_dbusInterface;
+}
+
+void AbstractDBusServiceMonitor::createInterface(const QString &)
+{
+    if (m_dbusInterface != nullptr) {
+        delete m_dbusInterface;
+        m_dbusInterface = nullptr;
+    }
+
+    m_dbusInterface = new QDBusInterface(m_service, m_path, m_interface,
+                                         QDBusConnection::sessionBus());
+    Q_EMIT serviceAvailableChanged(true);
+}
+
+void AbstractDBusServiceMonitor::destroyInterface(const QString &)
+{
+    if (m_dbusInterface != nullptr) {
+        delete m_dbusInterface;
+        m_dbusInterface = nullptr;
+    }
+
+    Q_EMIT serviceAvailableChanged(false);
+}
+
+QDBusInterface* AbstractDBusServiceMonitor::dbusInterface() const
+{
+    return m_dbusInterface;
+}
+
+bool AbstractDBusServiceMonitor::serviceAvailable() const
+{
+    return m_dbusInterface != nullptr;
+}

=== added file 'src/libunity8-private/abstractdbusservicemonitor.h'
--- src/libunity8-private/abstractdbusservicemonitor.h	1970-01-01 00:00:00 +0000
+++ src/libunity8-private/abstractdbusservicemonitor.h	2014-09-29 14:27:27 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2011-2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Ugo Riboni <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#ifndef ABSTRACTDBUSSERVICEMONITOR_H
+#define ABSTRACTDBUSSERVICEMONITOR_H
+
+#include <QObject>
+#include <QString>
+#include <QDBusConnection>
+
+class QDBusInterface;
+class QDBusServiceWatcher;
+
+class Q_DECL_EXPORT AbstractDBusServiceMonitor : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(Bus)
+    Q_PROPERTY(bool serviceAvailable READ serviceAvailable NOTIFY serviceAvailableChanged)
+
+public:
+    enum Bus {
+        SessionBus,
+        SystemBus,
+    };
+
+    explicit AbstractDBusServiceMonitor(const QString &service, const QString &path, const QString &interface,
+                                        const Bus bus = SessionBus,
+                                        QObject *parent = 0);
+    ~AbstractDBusServiceMonitor();
+
+    QDBusInterface* dbusInterface() const;
+
+    bool serviceAvailable() const;
+
+Q_SIGNALS:
+    void serviceAvailableChanged(bool available);
+
+private Q_SLOTS:
+    void createInterface(const QString &service);
+    void destroyInterface(const QString &service);
+
+protected:
+    const QString m_service;
+    const QString m_path;
+    const QString m_interface;
+    QDBusServiceWatcher* m_watcher;
+    QDBusInterface* m_dbusInterface;
+};
+
+#endif // ABSTRACTDBUSSERVICEMONITOR_H

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2014-08-27 16:12:21 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2014-09-29 14:27:27 +0000
@@ -43,6 +43,7 @@
 ApplicationManager::ApplicationManager(QObject *parent)
     : ApplicationManagerInterface(parent)
     , m_suspended(false)
+    , m_forceDashActive(false)
 {
     m_roleNames.insert(RoleSession, "session");
     m_roleNames.insert(RoleFullscreen, "fullscreen");
@@ -292,6 +293,31 @@
     Q_EMIT suspendedChanged();
 }
 
+bool ApplicationManager::forceDashActive() const
+{
+    return m_forceDashActive;
+}
+
+void ApplicationManager::setForceDashActive(bool forceDashActive)
+{
+    if (m_forceDashActive == forceDashActive) {
+        return;
+    }
+
+    ApplicationInfo *dash = findApplication("unity8-dash");
+    if (dash) {
+        if (forceDashActive) {
+            dash->setState(ApplicationInfo::Running);
+        } else {
+            if (!dash->focused()) {
+                dash->setState(ApplicationInfo::Suspended);
+            }
+        }
+    }
+    m_forceDashActive = forceDashActive;
+    Q_EMIT forceDashActiveChanged();
+}
+
 bool ApplicationManager::focusApplication(const QString &appId)
 {
     ApplicationInfo *application = findApplication(appId);

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
--- tests/mocks/Unity/Application/ApplicationManager.h	2014-08-27 20:58:10 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.h	2014-09-29 14:27:27 +0000
@@ -99,8 +99,11 @@
     Q_INVOKABLE bool stopApplication(const QString &appId) override;
 
     QString focusedApplicationId() const override;
-    bool suspended() const;
-    void setSuspended(bool suspended);
+    bool suspended() const override;
+    void setSuspended(bool suspended) override;
+
+    bool forceDashActive() const override;
+    void setForceDashActive(bool forceDashActive) override;
 
     // Only for testing
     Q_INVOKABLE QStringList availableApplications();
@@ -124,6 +127,7 @@
     void buildListOfAvailableApplications();
     void onWindowCreated();
     bool m_suspended;
+    bool m_forceDashActive;
     QList<ApplicationInfo*> m_runningApplications;
     QList<ApplicationInfo*> m_availableApplications;
     QTimer m_windowCreatedTimer;

=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
--- tests/mocks/Unity/Application/CMakeLists.txt	2014-09-12 20:16:54 +0000
+++ tests/mocks/Unity/Application/CMakeLists.txt	2014-09-29 14:27:27 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
 
 set(FakeUnityApplicationQml_SOURCES
     plugin.cpp

=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
--- tests/plugins/Unity/Launcher/CMakeLists.txt	2014-09-19 11:20:07 +0000
+++ tests/plugins/Unity/Launcher/CMakeLists.txt	2014-09-29 14:27:27 +0000
@@ -1,6 +1,6 @@
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-09-19 11:20:07 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-09-29 14:27:27 +0000
@@ -105,6 +105,8 @@
     bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }
     bool suspended() const { return false; }
     void setSuspended(bool) {}
+    bool forceDashActive() const { return false; }
+    void setForceDashActive(bool) {}
 
 private:
     QList<MockApp*> m_list;