Merge lp:~unity-team/unity-scopes-shell/drop-appid-workaround into lp:unity-scopes-shell

[Michael Zanetti]

drop appId workaround for shell as dash will now use UAL to launch apps

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

https://code.launchpad.net/~unity-team/unity8/dash-as-app/+merge/228534

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

Yes

 * 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?

no

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

no

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/166/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/63/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:112
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/167/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/64/console

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

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

+1, land when appropriate pls.

review: Approve

[Michal Hruby (mhr3)]

Yep

review: Approve

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-07-31 13:04:20 +0000
+++ src/Unity/scope.cpp	2014-08-04 13:20:18 +0000
@@ -902,30 +902,15 @@
 
 void Scope::activateUri(QString const& uri)
 {
-    /* Tries various methods to trigger a sensible action for the given 'uri'.
-       If it has no understanding of the given scheme it falls back on asking
-       Qt to open the uri.
-    */
+    /*
+     * If it's a scope URI, perform the query, otherwise ask Qt to open it.
+     */
     QUrl url(uri);
-    if (url.scheme() == QLatin1String("application")) {
-        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(0, dir.length());
-                    path.replace('/', '-');
-                    break;
-                }
-            }
-        }
-
-        Q_EMIT activateApplication(QFileInfo(path).completeBaseName());
-    } else if (url.scheme() == QLatin1String("scope")) {
+    if (url.scheme() == QLatin1String("scope")) {
         qDebug() << "Got scope URI" << uri;
         performQuery(uri);
     } else {
         qDebug() << "Trying to open" << uri;
-        /* Try our luck */
         QDesktopServices::openUrl(url);
     }
 }

=== modified file 'tests/previewtest.cpp'
--- tests/previewtest.cpp	2014-07-31 11:08:50 +0000
+++ tests/previewtest.cpp	2014-08-04 13:20:18 +0000
@@ -167,30 +167,6 @@
         QCOMPARE(preview->processingAction(), false);
     }
 
-    void testPreviewUriAction()
-    {
-        QScopedPointer<PreviewStack> preview_stack;
-        QVERIFY(previewForFirstResult(m_scope, QString("layout"), preview_stack));
-
-        QCOMPARE(preview_stack->rowCount(), 1);
-        QCOMPARE(preview_stack->widgetColumnCount(), 1);
-        auto preview = preview_stack->getPreviewModel(0);
-        QTRY_COMPARE(preview->loaded(), true);
-        QCOMPARE(preview->rowCount(), 1);
-
-        QSignalSpy spy(m_scope, SIGNAL(activateApplication(QString)));
-        QVariantMap hints;
-        hints["uri"] = QString("application:///tmp/non-existent.desktop");
-        Q_EMIT preview->triggered(QString("actions"), QString("open"), hints);
-        // this is likely to be invoked synchronously
-        if (spy.count() == 0) {
-            QVERIFY(spy.wait());
-        }
-        QList<QVariant> arguments = spy.takeFirst();
-        auto desktopFile = arguments.at(0).value<QString>();
-        QCOMPARE(desktopFile, QString("non-existent"));
-    }
-
     void testPreviewReplacingPreview()
     {
         QScopedPointer<PreviewStack> preview_stack;