Merge lp:~sil2100/unity-scopes-shell/revert_25 into lp:unity-scopes-shell

[Łukasz Zemczak]

Revert rev 25 as it seems to cause a big regression, breaking launching of click applications in unity8

Revert rev 25 as it seems to cause a big regression, breaking launching of click applications in unity8

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2013-12-04 15:52:41 +0000
+++ src/Unity/scope.cpp	2013-12-11 16:00:15 +0000
@@ -32,8 +32,6 @@
 #include <QDebug>
 #include <QtGui/QDesktopServices>
 #include <QQmlEngine>
-#include <QFileInfo>
-#include <QDir>
 
 #include <UnityCore/Variant.h>
 #include <UnityCore/GLibWrapper.h>
@@ -289,19 +287,25 @@
         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_FOREACH(const QString &dir, QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation)) {
-                if (path.startsWith(dir)) {
-                    path.remove(dir);
-                    path.replace('/', '-');
-                    break;
-                }
+        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;
             }
+            g_key_file_free(key_file);
+            g_free(full_path);
         }
-
-        Q_EMIT activateApplication(QFileInfo(path).baseName());
         return;
     }