Merge lp:~mzanetti/unity-scopes-shell/activate-appid-2 into lp:unity-scopes-shell

[Michael Zanetti]

Activate applications by the appId instead of the path to the desktop file to align it with how the rest of unity8 works.

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

N/A

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

Yes

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

N/A

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

N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/76/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trusty-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trusty-armhf-ci/76
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trusty-armhf-ci/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trusty-i386-ci/76

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/76/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

New scopes are already doing this, and support for old scopes will hopefully go away soon, so unless you terribly needed this yesterday, I think we can forget about it.

[Michael Zanetti (mzanetti)]

> New scopes are already doing this, and support for old scopes will hopefully
> go away soon, so unless you terribly needed this yesterday, I think we can
> forget about it.

We do need this in case the right-edge lands before the new scopes.

[Michal Hruby (mhr3)]

Fine with me.

review: Approve

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2013-12-11 15:58:54 +0000
+++ src/Unity/scope.cpp	2014-02-07 19:16:42 +0000
@@ -32,6 +32,8 @@
 #include <QDebug>
 #include <QtGui/QDesktopServices>
 #include <QQmlEngine>
+#include <QFileInfo>
+#include <QDir>
 
 #include <UnityCore/Variant.h>
 #include <UnityCore/GLibWrapper.h>
@@ -287,25 +289,18 @@
         return;
     }
     if (url.scheme() == "application") {
-        // get the full path to the desktop file
         QString path(url.path().isEmpty() ? url.authority() : url.path());
-        if (path.startsWith("/")) {
-            Q_EMIT activateApplication(path);
-        } else {
-            // TODO: use the new desktop file finder/parser when it's ready
-            gchar* full_path = nullptr;
-            GKeyFile* key_file = g_key_file_new();
-            QString apps_path = "applications/" + path;
-            if (g_key_file_load_from_data_dirs(key_file, apps_path.toLocal8Bit().constData(), &full_path,
-                                               G_KEY_FILE_NONE, nullptr)) {
-                path = full_path;
-                Q_EMIT activateApplication(path);
-            } else {
-                qWarning() << "Unable to activate " << path;
+        if (path.startsWith('/')) {
+            Q_FOREACH(const QString &dir, QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation)) {
+                if (path.startsWith(dir)) {
+                    path.remove(dir);
+                    path.replace('/', '-');
+                    break;
+                }
             }
-            g_key_file_free(key_file);
-            g_free(full_path);
         }
+
+        Q_EMIT activateApplication(QFileInfo(path).completeBaseName());
         return;
     }