on xenial help sign in
undo accidental commits
commit70e3a15bd04cd1eb5d1fc0026fcb8f9faa1f9852 authorMichael Terry <michael.terry@canonical.com> dateThu 29 May 2014, 16:10 (12 years ago) parent13d4102
7 files changed+3−41
debian/control−1 plugins/Unity/Launcher/CMakeLists.txt+2−6 plugins/Unity/Launcher/launchermodel.cpp−26 plugins/Unity/Launcher/launchermodel.h−1 qml/GreeterShell.qml+1−1 tests/mocks/Unity/Launcher/MockLauncherModel.cpp−5 tests/mocks/Unity/Launcher/MockLauncherModel.h−1
debian/control−1
@@ -20,7 +20,6 @@ Build-Depends: cmake,
2020 libqt5xmlpatterns5-dev,
2121 libunity-api-dev (>= 7.80.6),
2222 libunity-mir-dev,
23− libupstart-app-launch2-dev,
2423 libusermetricsoutput1-dev,
2524 libxcb1-dev,
2625 pkg-config,
plugins/Unity/Launcher/CMakeLists.txt+2−6
@@ -2,7 +2,6 @@ include(FindPkgConfig)
22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
33pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)
44pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
5−pkg_check_modules(UPSTART_APP_LAUNCH REQUIRED upstart-app-launch-2)
65
76add_definitions(-DSM_BUSNAME=systemBus)
87
@@ -10,7 +9,6 @@ include_directories(
109 ${CMAKE_CURRENT_SOURCE_DIR}
1110 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
1211 ${GSETTINGS_QT_INCLUDE_DIRS}
13− ${UPSTART_APP_LAUNCH_INCLUDE_DIRS}
1412)
1513
1614set(QMLLAUNCHERPLUGIN_SRC
@@ -30,10 +28,8 @@ add_library(UnityLauncher-qml MODULE
3028 ${QMLLAUNCHERPLUGIN_SRC}
3129 )
3230
33−target_link_libraries(UnityLauncher-qml
34− ${GSETTINGS_QT_LDFLAGS}
35− ${UPSTART_APP_LAUNCH_LDFLAGS}
36−)
31+target_link_libraries(UnityLauncher-qml ${GSETTINGS_QT_LDFLAGS})
32+
3733qt5_use_modules(UnityLauncher-qml DBus Qml)
3834
3935add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
plugins/Unity/Launcher/launchermodel.cpp−26
@@ -22,7 +22,6 @@
2222#include "backend/launcherbackend.h"
2323
2424#include <unity/shell/application/ApplicationInfoInterface.h>
25−#include <upstart-app-launch.h>
2625
2726using namespace unity::shell::application;
2827
@@ -196,31 +195,6 @@ void LauncherModel::setUser(const QString &username)
196195 m_backend->setUser(username);
197196}
198197
199−QString LauncherModel::getUrlForAppId(const QString &appId)
200−{
201− // appId is either an appId or a legacy app name. Let's find out which
202− QString url;
203− gchar *package, *app, *version, *longAppId;
204−
205− // assume legacy app until proven otherwise
206− url = "application:///" + appId + ".desktop";
207−
208− if (upstart_app_launch_app_id_parse(appId.first().toLatin1().constData(),
209− &package, &app, &version)) {
210− // Turn it back into an appId to test if it's a click app or not
211− longAppId = upstart_app_launch_triplet_to_app_id(package, app, version);
212− if (longAppId != nullptr) { // it is a click app!
213− url = QString("appid://%1/%2/%3").args(package, app, version);
214− g_free(longAppId);
215− }
216− g_free(package);
217− g_free(app);
218− g_free(version);
219− }
220−
221− return url;
222−}
223−
224198void LauncherModel::refreshStoredApplications()
225199{
226200 // First remove any existing ones
plugins/Unity/Launcher/launchermodel.h−1
@@ -51,7 +51,6 @@ public:
5151 Q_INVOKABLE void requestRemove(const QString &appId);
5252 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
5353 Q_INVOKABLE void setUser(const QString &username);
54− Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
5554
5655 unity::shell::application::ApplicationManagerInterface* applicationManager() const;
5756 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
qml/GreeterShell.qml+1−1
@@ -201,7 +201,7 @@ BasicShell {
201201 dragAreaWidth: shell.edgeSize
202202 available: !edgeDemo.active
203203 onLauncherApplicationSelected: {
204− shell.activateApplication(LauncherModel.getUrlForAppId(appId))
204+ shell.activateApplication("application:///" + appId + ".desktop")
205205 }
206206 onShownChanged: {
207207 if (shown) {
tests/mocks/Unity/Launcher/MockLauncherModel.cpp−5
@@ -183,11 +183,6 @@ void MockLauncherModel::setUser(const QString &username)
183183 // TODO: implement this...
184184}
185185
186−QString LauncherModel::getUrlForAppId(const QString &appId)
187−{
188− return "application:///" + appId + ".desktop";
189−}
190−
191186void MockLauncherModel::setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager)
192187{
193188 Q_UNUSED(applicationManager)
tests/mocks/Unity/Launcher/MockLauncherModel.h−1
@@ -44,7 +44,6 @@ public:
4444 Q_INVOKABLE void requestRemove(const QString &appId);
4545 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
4646 Q_INVOKABLE void setUser(const QString &username);
47− Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
4847
4948 unity::shell::application::ApplicationManagerInterface *applicationManager() const;
5049 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);