Merge lp:~mzanetti/unity-mir/strip-app-id into lp:unity-mir

[Michael Zanetti]

Unmerged revisions

210. By Michael Zanetti on 2014-04-09

try the same workaround as for the launcher to deal with long app ids

=== modified file 'src/modules/Unity/Application/desktopfilereader.cpp'
--- src/modules/Unity/Application/desktopfilereader.cpp	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/desktopfilereader.cpp	2014-04-09 17:20:32 +0000
@@ -57,7 +57,14 @@
     DLOG("DesktopFileReader::DesktopFileReader (this=%p, appId='%s')", this, appId.toLatin1().data());
     DASSERT(appId != NULL);
 
-    file_ = findDesktopFile(appId);
+    QString helper = appId;
+    if (helper.startsWith("appid://")) {
+        helper.remove("appid://");
+        // Strip hook name and current-user-version in case its there
+        helper = appId.split('/').first();
+    }
+
+    file_ = findDesktopFile(helper);
     loaded_ = loadDesktopFile(file_);
 }