0905b5f · unity8 · git.iko.soy

debian/control+1

compare with xenial

unifiedsplit

@@ -20,6 +20,7 @@ Build-Depends: cmake,

20 libqt5xmlpatterns5-dev,

21 libunity-api-dev (>= 7.80.6),

22 libunity-mir-dev,

23+ libupstart-app-launch2-dev,

23 libusermetricsoutput1-dev,

24 libusermetricsoutput1-dev,

24 libxcb1-dev,

25 libxcb1-dev,

25 pkg-config,

26 pkg-config,

plugins/Unity/Launcher/CMakeLists.txt+2

@@ -3,6 +3,7 @@ pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)

3pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)

4pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)

5pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

6+pkg_check_modules(UPSTART_APP_LAUNCH REQUIRED upstart-app-launch-2)

6

7

7add_definitions(-DSM_BUSNAME=systemBus)

8add_definitions(-DSM_BUSNAME=systemBus)

8

9

@@ -11,6 +12,7 @@ include_directories(

11 ${CMAKE_SOURCE_DIR}/plugins/AccountsService

12 ${CMAKE_SOURCE_DIR}/plugins/AccountsService

12 ${GLIB_INCLUDE_DIRS}

13 ${GLIB_INCLUDE_DIRS}

13 ${GSETTINGS_QT_INCLUDE_DIRS}

14 ${GSETTINGS_QT_INCLUDE_DIRS}

15+ ${UPSTART_APP_LAUNCH_INCLUDE_DIRS}

14)

16)

15

17

16set(QMLLAUNCHERPLUGIN_SRC

18set(QMLLAUNCHERPLUGIN_SRC

plugins/Unity/Launcher/launchermodel.cpp+1

@@ -22,6 +22,7 @@

22#include "backend/launcherbackend.h"

23

24#include <unity/shell/application/ApplicationInfoInterface.h>

25+#include <upstart-app-launch.h>

25

26

26using namespace unity::shell::application;

27using namespace unity::shell::application;

27

28

plugins/Unity/Launcher/launchermodel.h+1

@@ -51,6 +51,7 @@ public:

51 Q_INVOKABLE void requestRemove(const QString &appId);

52 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

53 Q_INVOKABLE void setUser(const QString &username);

54+ Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;

54

55

55 unity::shell::application::ApplicationManagerInterface* applicationManager() const;

56 unity::shell::application::ApplicationManagerInterface* applicationManager() const;

56 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);

57 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);

qml/GreeterShell.qml+1−1

@@ -201,7 +201,7 @@ BasicShell {

201 dragAreaWidth: shell.edgeSize

202 available: !edgeDemo.active

203 onLauncherApplicationSelected: {

204− shell.activateApplication("application:///" + appId + ".desktop")

204+ shell.activateApplication(LauncherModel.getUrlForAppId(appId))

205 }

206 onShownChanged: {

207 if (shown) {

tests/mocks/Unity/Launcher/MockLauncherModel.h+1

@@ -44,6 +44,7 @@ public:

44 Q_INVOKABLE void requestRemove(const QString &appId);

45 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

46 Q_INVOKABLE void setUser(const QString &username);

47+ Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;

47

48

48 unity::shell::application::ApplicationManagerInterface *applicationManager() const;

49 unity::shell::application::ApplicationManagerInterface *applicationManager() const;

49 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);

50 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);