Merge lp:~gerboland/qtmir/fix-desktop_file_hint into lp:qtmir

[Gerry Boland]

authorizeSession incorrectly edits desktopFilePath supplied by desktop_file_hint

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:350
http://jenkins.qa.ubuntu.com/job/qtmir-ci/354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/87
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/87/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/354/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Code looks ok and I didn't spot any regressions when trying it out on a device.

The following happens *with or without* this patch. Doesn't know if it's meant to fix that or not:

This works:
qmlscene football.qml --desktop_file_hint=/usr/share/applications/dialer-app.desktop

This fails (http://paste.ubuntu.com/12048029/):
qmlscene football.qml --desktop_file_hint=/usr/share/click/preinstalled/com.ubuntu.gallery/2.9.1.1209/share/applications/gallery-app.desktop

review: Approve

[Gerry Boland (gerboland)]

Sure you had this patch installed? For the same desktop file, I do get an error, but it looks like this:

qtmir.applications: Desktop file for appId: "gallery-app" at: "/usr/share/click/preinstalled/com.ubuntu.gallery/2.9.1.1209/share/applications/gallery-app.desktop" is not valid - check its syntax, and that the binary specified by the Exec line is installed!

which is technically true, as the Exec line is
Exec=./gallery-app %u
which is relative, which gdb not happy about. That's something else, which I'm not sure is worth fixing

[Gerry Boland (gerboland)]

s/gdb/gdk/

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2015-05-21 18:38:27 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2015-08-10 12:04:21 +0000
@@ -736,7 +736,7 @@
         return;
     }
 
-    QString desktopFileName = info->getParameter("--desktop_file_hint=");
+    const QString desktopFileName = info->getParameter("--desktop_file_hint=");
 
     if (desktopFileName.isNull()) {
         qCritical() << "ApplicationManager REJECTED connection from app with pid" << pid
@@ -747,7 +747,7 @@
     qCDebug(QTMIR_APPLICATIONS) << "Process supplied desktop_file_hint, loading:" << desktopFileName;
 
     // Guess appId from the desktop file hint
-    QString appId = toShortAppIdIfPossible(desktopFileName.remove(QRegExp(".desktop$")).split('/').last());
+    const QString appId = toShortAppIdIfPossible(desktopFileName.split('/').last().remove(QRegExp(".desktop$")));
 
     // FIXME: right now we support --desktop_file_hint=appId for historical reasons. So let's try that in
     // case we didn't get an existing .desktop file path