Merge lp:~gerboland/unity-mir/shortAppIds-0.1.9 into lp:unity-mir

[Gerry Boland]

Add support for short appIds

Shells should use only short AppIds (i.e. appId without the version string). In order to support this, needed to
- slightly decouple appId from the desktop file path, now need to ask the ApplicationController implementation for the path to the desktop file
- DesktopFileReader now just a dumb file reader
- in the upstart ApplicationController interface & implementation, convert any long appIds to short appIds
- in ApplicationManager, to ease transition, have startApplication support both long & short appIds. But otherwise it uses short appIds only.

Add support for short appIds

Shells should use only short AppIds (i.e. appId without the version string). In order to support this, needed to
- slightly decouple appId from the desktop file path, now need to ask the ApplicationController implementation for the path to the desktop file
- DesktopFileReader now just a dumb file reader
- in the upstart ApplicationController interface & implementation, convert any long appIds to short appIds
- in ApplicationManager, to ease transition, have startApplication support both long & short appIds. But otherwise it uses short appIds only.

[lp:~gerboland/unity-mir/shortAppIds-0.1.9]

228. By Gerry Boland on 2014-05-13

Remove unused header

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/337/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/337/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

changelog please

review: Needs Fixing

[Michael Zanetti (mzanetti)]

err... checklist... sorry

[Gerry Boland (gerboland)]

Checklist:
 * Are there any related MPs required for this MP to build/function as expected? Please list.
lp:~mzanetti/unity8/support-short-appid-in-gsettings
 * 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

[Michael Zanetti (mzanetti)]

74 + if (desktopFileName.get().endsWith(".desktop")) {
75 + appId = toShortAppIdIfPossible(desktopFileName.get().left( desktopFileName.get().length() - 8));
76 + } else {
77 + appId = toShortAppIdIfPossible(desktopFileName.get());
78 + }

can there be .desktop files not ending with .desktop?

desktopFileName.remove(QRegExp(".desktop$")) perhaps?

review: Needs Information

[Gerry Boland (gerboland)]

> can there be .desktop files not ending with .desktop?
Really old legacy support for --desktop_file_hint=appId <- very naughty, maybe I should just remove that support entirely

> desktopFileName.remove(QRegExp(".desktop$")) perhaps?
Oh that's nicer, thanks!

[Michael Zanetti (mzanetti)]

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

Yes

 * Did CI run pass? If not, please explain why.

Yes

review: Approve

[lp:~gerboland/unity-mir/shortAppIds-0.1.9]

229. By Gerry Boland on 2014-05-13

Correction to "appId guess from desktop file name" code (thanks for suggestion mzanetti)

230. By Gerry Boland on 2014-05-13

Test appId guess from desktop file name

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/338/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/338/rebuild

review: Approve (continuous-integration)

[lp:~gerboland/unity-mir/shortAppIds-0.1.9]

231. By Gerry Boland on 2014-05-13

Extra test for long appId, fix bug

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/339/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/339/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

after installing this from silo 005, launching settings through the indicators seems broken.

[Michael Zanetti (mzanetti)]

go to music scope, open a song's preview and click on "play in music app". doesn't seem to work any more either.

review: Needs Fixing

[lp:~gerboland/unity-mir/shortAppIds-0.1.9]

232. By Gerry Boland on 2014-05-14

Possible fix for bug where if app updated while running, need to refer to it by old long-appId, not short appId

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/340/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Launching accounts from system settings app seems broken:

ApplicationManager REJECTED connection from app with pid 4025 as desktop_file_hint file not found

review: Needs Fixing

[lp:~gerboland/unity-mir/shortAppIds-0.1.9]

233. By Gerry Boland on 2014-05-15

Fix shortening of appId - no need to deref pointer

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/341/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/341/rebuild

review: Approve (continuous-integration)

[lp:~gerboland/unity-mir/shortAppIds-0.1.9]

234. By Gerry Boland on 2014-05-16

Fix typo breaking apps launching via command line

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:234
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/342/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/342/rebuild

review: Approve (continuous-integration)

[lp:~gerboland/unity-mir/shortAppIds-0.1.9]

235. By Gerry Boland on 2014-05-16

Have AppMan invokable methods gracefully handle long appIds. Do not re-create new Application for existing app

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:235
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/343/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/343/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Ok. looking good. all test plans passing.

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

Yes

 * Did CI run pass? If not, please explain why.

it did!

review: Approve

=== modified file 'src/modules/Unity/Application/application.cpp'
--- src/modules/Unity/Application/application.cpp	2014-04-15 14:31:02 +0000
+++ src/modules/Unity/Application/application.cpp	2014-05-16 12:20:01 +0000
@@ -52,6 +52,9 @@
 
     m_suspendTimer->setSingleShot(true);
     connect(m_suspendTimer, SIGNAL(timeout()), this, SLOT(suspend()));
+
+    // FIXME(greyback) need to save long appId internally until upstart-app-launch can hide it from us
+    m_longAppId = desktopFileReader->file().remove(QRegExp(".desktop$")).split('/').last();
 }
 
 Application::~Application()
@@ -276,13 +279,13 @@
 void Application::suspend()
 {
     DLOG("Application::suspend (this=%p)", this);
-    m_taskController->suspend(appId());
+    m_taskController->suspend(longAppId());
 }
 
 void Application::resume()
 {
     DLOG("Application::resume (this=%p)", this);
-    m_taskController->resume(appId());
+    m_taskController->resume(longAppId());
 }
 
 void Application::respawn()
@@ -291,4 +294,9 @@
     m_taskController->start(appId(), m_arguments);
 }
 
+QString Application::longAppId() const
+{
+    return m_longAppId;
+}
+
 } // namespace unitymir

=== modified file 'src/modules/Unity/Application/application.h'
--- src/modules/Unity/Application/application.h	2014-04-15 14:31:02 +0000
+++ src/modules/Unity/Application/application.h	2014-05-16 12:20:01 +0000
@@ -89,6 +89,7 @@
     void visibleChanged();
 
 private:
+    QString longAppId() const;
     void setPid(pid_t pid);
     void setState(State state);
     void setFocused(bool focus);
@@ -98,6 +99,7 @@
 
     QSharedPointer<TaskController> m_taskController;
     DesktopFileReader* m_desktopData;
+    QString m_longAppId;
     qint64 m_pid;
     Stage m_stage;
     State m_state;

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-04-15 14:31:02 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-05-16 12:20:01 +0000
@@ -76,6 +76,17 @@
         );
 }
 
+// FIXME: To be removed once shell has fully adopted short appIds!!
+QString toShortAppIdIfPossible(const QString &appId) {
+    QRegExp longAppIdMask("[a-z0-9][a-z0-9+.-]+_[a-zA-Z0-9+.-]+_[0-9][a-zA-Z0-9.+:~-]*");
+    if (longAppIdMask.exactMatch(appId)) {
+        LOG("WARNING: long App ID encountered: %s", qPrintable(appId));
+        // input string a long AppId, chop the version string off the end
+        QStringList parts = appId.split("_");
+        return QString("%1_%2").arg(parts.first()).arg(parts.at(1));
+    }
+    return appId;
+}
 
 void connectToSessionListener(ApplicationManager * manager, SessionListener * listener)
 {
@@ -262,8 +273,10 @@
     return m_applications.at(index);
 }
 
-Application* ApplicationManager::findApplication(const QString &appId) const
+Application* ApplicationManager::findApplication(const QString &inputAppId) const
 {
+    const QString appId = toShortAppIdIfPossible(inputAppId);
+
     for (Application *app : m_applications) {
         if (app->appId() == appId) {
             return app;
@@ -272,8 +285,10 @@
     return nullptr;
 }
 
-bool ApplicationManager::requestFocusApplication(const QString &appId)
+bool ApplicationManager::requestFocusApplication(const QString &inputAppId)
 {
+    const QString appId = toShortAppIdIfPossible(inputAppId);
+
     DLOG("ApplicationManager::requestFocusApplication (this=%p, appId=%s)", this, qPrintable(appId));
     Application *application = findApplication(appId);
 
@@ -355,8 +370,10 @@
         application->setState(Application::Running);
 }
 
-bool ApplicationManager::focusApplication(const QString &appId)
+bool ApplicationManager::focusApplication(const QString &inputAppId)
 {
+    const QString appId = toShortAppIdIfPossible(inputAppId);
+
     Application *application = findApplication(appId);
     DLOG("ApplicationManager::focusApplication (this=%p, application=%p, appId=%s)", this, application, qPrintable(appId));
 
@@ -412,9 +429,26 @@
     return startApplication(appId, NoFlag, arguments);
 }
 
-Application *ApplicationManager::startApplication(const QString &appId, ExecFlags flags,
+/**
+ * @brief ApplicationManager::startApplication launches an application identified by an "application id" or appId.
+ *
+ * Note: due to an implementation detail, appIds come in two forms:
+ * * long appId: $(click_package)_$(application)_$(version)
+ * * short appId: $(click_package)_$(application)
+ * It is expected that the shell uses _only_ short appIds (but long appIds are accepted by this method for legacy
+ * reasons - but be warned, this ability will be removed)
+ *
+ * Unless stated otherwise, we always use short appIds in this API.
+ *
+ * @param inputAppId AppId of application to launch (long appId supported)
+ * @param flags Shell specific flags to modify the initial state of the application
+ * @param arguments Command line arguments to pass to the application to be launched
+ * @return Pointer to Application object representing the launched process
+ */
+Application *ApplicationManager::startApplication(const QString &inputAppId, ExecFlags flags,
                                                   const QStringList &arguments)
 {
+    QString appId = toShortAppIdIfPossible(inputAppId);
     DLOG("ApplicationManager::startApplication (this=%p, appId=%s)", this, qPrintable(appId));
 
     if (!m_taskController->start(appId, arguments)) {
@@ -425,15 +459,15 @@
     {
         Application * application = findApplication(appId);
         if (application) {
-            DLOG("ApplicationManager::startApplication - application already "
-                 "exists: (this=%p, app=%p, appId=%s)",
+            DLOG("ApplicationManager::startApplication - application already exists: (this=%p, app=%p, appId=%s)",
                  this, application, qPrintable(appId));
+            return application;
         }
     }
 
     Application* application = new Application(
                 m_taskController,
-                m_desktopFileReaderFactory->createInstanceForAppId(appId),
+                m_desktopFileReaderFactory->createInstance(appId, m_taskController->findDesktopFileForAppId(appId)),
                 Application::Starting,
                 arguments,
                 this);
@@ -467,7 +501,7 @@
     if (!application) { // if shell did not start this application, but upstart did
         application = new Application(
                     m_taskController,
-                    m_desktopFileReaderFactory->createInstanceForAppId(appId),
+                    m_desktopFileReaderFactory->createInstance(appId, m_taskController->findDesktopFileForAppId(appId)),
                     Application::Starting,
                     QStringList(), this);
         if (!application->isValid()) {
@@ -489,8 +523,10 @@
     }
 }
 
-bool ApplicationManager::stopApplication(const QString &appId)
+bool ApplicationManager::stopApplication(const QString &inputAppId)
 {
+    const QString appId = toShortAppIdIfPossible(inputAppId);
+
     Application *application = findApplication(appId);
     DLOG("ApplicationManager::stopApplication (this=%p, application=%p, appId=%s)", this, application, qPrintable(appId));
 
@@ -504,7 +540,7 @@
     remove(application);
     m_dbusWindowStack->WindowDestroyed(0, application->appId());
 
-    bool result = m_taskController->stop(application->appId());
+    bool result = m_taskController->stop(application->longAppId());
 
     LOG_IF(result == false, "FAILED to ask Upstart to stop application '%s'", qPrintable(application->appId()));
 
@@ -521,8 +557,10 @@
     return result;
 }
 
-bool ApplicationManager::updateScreenshot(const QString &appId)
+bool ApplicationManager::updateScreenshot(const QString &inputAppId)
 {
+    const QString appId = toShortAppIdIfPossible(inputAppId);
+
     Application *application = findApplication(appId);
 
     if (!application) {
@@ -642,7 +680,7 @@
 
     for (Application *app : m_applications) {
         if (app->state() == Application::Starting
-                && m_taskController->appIdHasProcessId(app->appId(), pid)) {
+                && m_taskController->appIdHasProcessId(app->longAppId(), pid)) {
             app->setPid(pid);
             DLOG("ApplicationManager::authorizeSession - connecting: application=%p and pid=%lld", app, pid);
             authorized = true;
@@ -678,13 +716,16 @@
 
     DLOG("Process supplied desktop_file_hint, loading '%s'", desktopFileName.get().toLatin1().data());
 
+    // Guess appId from the desktop file hint
+    QString appId = toShortAppIdIfPossible(desktopFileName.get().remove(QRegExp(".desktop$")).split('/').last());
+
     // 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
     DesktopFileReader* desktopData;
     if (QFileInfo(desktopFileName.get()).exists()) {
-        desktopData = m_desktopFileReaderFactory->createInstanceForDesktopFile(QFileInfo(desktopFileName.get()));
+        desktopData = m_desktopFileReaderFactory->createInstance(appId, QFileInfo(desktopFileName.get()));
     } else {
-        desktopData = m_desktopFileReaderFactory->createInstanceForAppId(desktopFileName.get());
+        desktopData = m_desktopFileReaderFactory->createInstance(appId, m_taskController->findDesktopFileForAppId(appId));
     }
 
     if (!desktopData->loaded()) {

=== modified file 'src/modules/Unity/Application/applicationcontroller.h'
--- src/modules/Unity/Application/applicationcontroller.h	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/applicationcontroller.h	2014-05-16 12:20:01 +0000
@@ -21,6 +21,7 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
+#include <QFileInfo>
 
 namespace unitymir
 {
@@ -47,6 +48,8 @@
     virtual bool stopApplicationWithAppId(const QString& appId) = 0;
     virtual bool startApplicationWithAppIdAndArgs(const QString& appId, const QStringList& arguments) = 0;
 
+    virtual QFileInfo findDesktopFileForAppId(const QString &appId) const = 0;
+
 Q_SIGNALS:
     void applicationAboutToBeStarted(QString id);
     void applicationStarted(QString id);

=== 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-05-16 12:20:01 +0000
@@ -22,8 +22,6 @@
 
 // Qt
 #include <QFile>
-#include <QDir>
-#include <QStandardPaths>
 
 namespace unitymir
 {
@@ -36,38 +34,23 @@
 {
 }
 
-DesktopFileReader* DesktopFileReader::Factory::createInstanceForAppId(const QString& appId)
-{
-    return new DesktopFileReader(appId);
-}
-
-DesktopFileReader* DesktopFileReader::Factory::createInstanceForDesktopFile(const QFileInfo& fi)
-{
-    return new DesktopFileReader(fi);
+DesktopFileReader* DesktopFileReader::Factory::createInstance(const QString &appId, const QFileInfo& fi)
+{
+    return new DesktopFileReader(appId, fi);
 }
 
 // Retrieves the size of an array at compile time.
 #define ARRAY_SIZE(a) \
     ((sizeof(a) / sizeof(*(a))) / static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
 
-DesktopFileReader::DesktopFileReader(const QString &appId)
+DesktopFileReader::DesktopFileReader(const QString &appId, const QFileInfo &desktopFile)
     : appId_(appId)
     , entries_(DesktopFileReader::kNumberOfEntries, "")
 {
-    DLOG("DesktopFileReader::DesktopFileReader (this=%p, appId='%s')", this, appId.toLatin1().data());
-    DASSERT(appId != NULL);
-
-    file_ = findDesktopFile(appId);
-    loaded_ = loadDesktopFile(file_);
-}
-
-DesktopFileReader::DesktopFileReader(const QFileInfo &desktopFile)
-    : entries_(DesktopFileReader::kNumberOfEntries, "")
-{
-    DLOG("DesktopFileReader::DesktopFileReader (this=%p, desktopFile='%s')", this, desktopFile.absoluteFilePath().toLatin1().data());
+    DLOG("DesktopFileReader::DesktopFileReader (this=%p, appId='%s', desktopFile='%s')", this,
+         qPrintable(appId), qPrintable(desktopFile.absoluteFilePath()));
     DASSERT(desktopFile.exists());
 
-    appId_ = desktopFile.completeBaseName();
     file_ = desktopFile.absoluteFilePath();
     loaded_ = loadDesktopFile(file_);
 }
@@ -78,30 +61,6 @@
     entries_.clear();
 }
 
-
-QString DesktopFileReader::findDesktopFile(const QString &appId) const
-{
-    DLOG("DesktopFileReader::findDesktopFile (appId='%s')", appId.toLatin1().data());
-
-    int dashPos = -1;
-    QString helper = appId;
-    QString desktopFile;
-
-    do {
-        if (dashPos != -1) {
-            helper = helper.replace(dashPos, 1, '/');
-        }
-
-        desktopFile = QStandardPaths::locate(QStandardPaths::ApplicationsLocation, QString("%1.desktop").arg(helper));
-        if (!desktopFile.isEmpty()) return desktopFile;
-
-        dashPos = helper.indexOf("-");
-    } while (dashPos != -1);
-
-    return QString();
-}
-
-
 bool DesktopFileReader::loadDesktopFile(QString desktopFile)
 {
     DLOG("DesktopFileReader::loadDesktopFile (this=%p, desktopFile='%s')",

=== modified file 'src/modules/Unity/Application/desktopfilereader.h'
--- src/modules/Unity/Application/desktopfilereader.h	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/desktopfilereader.h	2014-05-16 12:20:01 +0000
@@ -35,8 +35,7 @@
 
         Factory& operator=(const Factory&) = delete;
 
-        virtual DesktopFileReader* createInstanceForAppId(const QString& appId);
-        virtual DesktopFileReader* createInstanceForDesktopFile(const QFileInfo& fi);
+        virtual DesktopFileReader* createInstance(const QString &appId, const QFileInfo& fi);
     };
 
     virtual ~DesktopFileReader();
@@ -50,13 +49,11 @@
     virtual QString path() const { return entries_[kPathIndex]; }
     virtual QString stageHint() const { return entries_[kStageHintIndex]; }
     virtual bool loaded() const { return loaded_; }
-    virtual QString findDesktopFile(const QString &appId) const;
 
 protected:
     friend class DesktopFileReaderFactory;
 
-    DesktopFileReader(const QString &appId);
-    DesktopFileReader(const QFileInfo &desktopFile);
+    DesktopFileReader(const QString &appId, const QFileInfo &desktopFile);
 
 private:
     static const int kNameIndex = 0,

=== modified file 'src/modules/Unity/Application/taskcontroller.cpp'
--- src/modules/Unity/Application/taskcontroller.cpp	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/taskcontroller.cpp	2014-05-16 12:20:01 +0000
@@ -107,6 +107,11 @@
     return m_appController->appIdHasProcessId(pid, appId);
 }
 
+QFileInfo TaskController::findDesktopFileForAppId(const QString &appId) const
+{
+    return m_appController->findDesktopFileForAppId(appId);
+}
+
 bool TaskController::suspend(const QString& appId)
 {
     DLOG("TaskController::suspend (this=%p, application=%p)", this, qPrintable(appId));

=== modified file 'src/modules/Unity/Application/taskcontroller.h'
--- src/modules/Unity/Application/taskcontroller.h	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/taskcontroller.h	2014-05-16 12:20:01 +0000
@@ -45,6 +45,7 @@
     bool resume(const QString& appId);
 
     bool appIdHasProcessId(const QString& appId, const quint64 pid);
+    QFileInfo findDesktopFileForAppId(const QString &appId) const;
 
 Q_SIGNALS:
     void processStartReport(const QString& appId, const bool failure);

=== modified file 'src/modules/Unity/Application/upstart/applicationcontroller.cpp'
--- src/modules/Unity/Application/upstart/applicationcontroller.cpp	2014-04-16 17:45:59 +0000
+++ src/modules/Unity/Application/upstart/applicationcontroller.cpp	2014-05-16 12:20:01 +0000
@@ -20,6 +20,9 @@
 // unity-mir
 #include <logging.h>
 
+// Qt
+#include <QStandardPaths>
+
 // upstart
 extern "C" {
     #include "upstart-app-launch.h"
@@ -40,33 +43,89 @@
     upstart_app_launch_app_failed_observer_t failureCallback = nullptr;
 };
 
+namespace {
+/**
+ * @brief toShortAppIdIfPossible
+ * @param appId - any string that you think is an appId
+ * @return if a valid appId was input, a shortened appId is returned, else returns the input string unaltered
+ */
+QString toShortAppIdIfPossible(const QString &appId) {
+    gchar *package, *application;
+    if (upstart_app_launch_app_id_parse(appId.toLatin1().constData(), &package, &application, nullptr)) {
+        // is long appId, so assemble its short appId
+        QString shortAppId = QString("%1_%2").arg(package).arg(application);
+        g_free(package);
+        g_free(application);
+        return shortAppId;
+    } else {
+        return appId;
+    }
+}
+
+/**
+ * @brief toLongAppIdIfPossible
+ * @param shortAppId - any string that you think is a short appId
+ * @return if valid short appId was input, the corresponding long appId is returned. If a long appId was
+ * entered, it is returned unchanged. Anything else is also returned unchanged.
+ */
+QString toLongAppIdIfPossible(const QString &shortAppId) {
+    if (upstart_app_launch_app_id_parse(shortAppId.toLatin1().constData(), nullptr, nullptr, nullptr)) {
+        // then we got a long appId after all, just return it
+        return shortAppId;
+    } else {
+        // try to parse the string in the form "$package_$application"
+        QRegExp shortAppIdMask("[a-z0-9][a-z0-9+.-]+_[a-zA-Z0-9+.-]+");
+        if (!shortAppIdMask.exactMatch(shortAppId)) {
+            // input string not a short appId, so just return it unchanged
+            return shortAppId;
+        }
+
+        // ask upstart for the long appId corresponding to this short appId
+        QStringList parts = shortAppId.split("_");
+        gchar *longAppId;
+        longAppId = upstart_app_launch_triplet_to_app_id(parts.first().toLatin1().constData(),
+                                                         parts.last().toLatin1().constData(),
+                                                         nullptr);
+        if (longAppId == nullptr) {
+            // was unable to construct a long appId from the short appId, return input unchanged
+            return shortAppId;
+        } else {
+            QString appId(longAppId);
+            g_free(longAppId);
+            return appId;
+        }
+    }
+}
+
+} // namespace
+
 ApplicationController::ApplicationController()
     : unitymir::ApplicationController(),
       impl(new Private())
 {
     impl->preStartCallback = [](const gchar * appId, gpointer userData) {
         auto thiz = static_cast<ApplicationController*>(userData);
-        Q_EMIT(thiz->applicationAboutToBeStarted(appId));
+        Q_EMIT(thiz->applicationAboutToBeStarted(toShortAppIdIfPossible(appId)));
     };
 
     impl->startedCallback = [](const gchar * appId, gpointer userData) {
         auto thiz = static_cast<ApplicationController*>(userData);
-        Q_EMIT(thiz->applicationStarted(appId));
+        Q_EMIT(thiz->applicationStarted(toShortAppIdIfPossible(appId)));
     };
 
     impl->stopCallback = [](const gchar * appId, gpointer userData) {
         auto thiz = static_cast<ApplicationController*>(userData);
-        Q_EMIT(thiz->applicationStopped(appId));
+        Q_EMIT(thiz->applicationStopped(toShortAppIdIfPossible(appId)));
     };
 
     impl->focusCallback = [](const gchar * appId, gpointer userData) {
         auto thiz = static_cast<ApplicationController*>(userData);
-        Q_EMIT(thiz->applicationFocusRequest(appId));
+        Q_EMIT(thiz->applicationFocusRequest(toShortAppIdIfPossible(appId)));
     };
 
     impl->resumeCallback = [](const gchar * appId, gpointer userData) {
         auto thiz = static_cast<ApplicationController*>(userData);
-        Q_EMIT(thiz->applicationResumeRequest(appId));
+        Q_EMIT(thiz->applicationResumeRequest(toShortAppIdIfPossible(appId)));
     };
 
     impl->failureCallback = [](const gchar * appId, upstart_app_launch_app_failed_t failureType, gpointer userData) {
@@ -78,7 +137,7 @@
         }
 
         auto thiz = static_cast<ApplicationController*>(userData);
-        Q_EMIT(thiz->applicationError(appId, error));
+        Q_EMIT(thiz->applicationError(toShortAppIdIfPossible(appId), error));
     };
 
     upstart_app_launch_observer_add_app_starting(impl->preStartCallback, this);
@@ -101,7 +160,7 @@
 
 pid_t ApplicationController::primaryPidForAppId(const QString& appId)
 {
-    GPid pid = upstart_app_launch_get_primary_pid(appId.toLatin1().constData());
+    GPid pid = upstart_app_launch_get_primary_pid(toLongAppIdIfPossible(appId).toLatin1().constData());
     DLOG_IF(!pid, "ApplicationController::stopApplication appId='%s' FAILED", qPrintable(appId));
 
     return pid;
@@ -109,12 +168,12 @@
 
 bool ApplicationController::appIdHasProcessId(pid_t pid, const QString& appId)
 {
-    return upstart_app_launch_pid_in_app_id(pid, appId.toLatin1().constData());
+    return upstart_app_launch_pid_in_app_id(pid, toLongAppIdIfPossible(appId).toLatin1().constData());
 }
 
 bool ApplicationController::stopApplicationWithAppId(const QString& appId)
 {
-    auto result = upstart_app_launch_stop_application(appId.toLatin1().constData());
+    auto result = upstart_app_launch_stop_application(toLongAppIdIfPossible(appId).toLatin1().constData());
     DLOG_IF(!result, "ApplicationController::stopApplicationWithAppId appId='%s' FAILED", qPrintable(appId));
     return result;
 }
@@ -130,7 +189,7 @@
     }
 
     auto result = upstart_app_launch_start_application(
-                appId.toLatin1().constData(),
+                toLongAppIdIfPossible(appId).toLatin1().constData(),
                 static_cast<const gchar * const *>(upstartArgs));
 
     g_strfreev(upstartArgs);
@@ -139,5 +198,28 @@
     return result;
 }
 
+QFileInfo ApplicationController::findDesktopFileForAppId(const QString &appId) const
+{
+    DLOG("ApplicationController::desktopFilePathForAppId (appId='%s')", qPrintable(appId));
+
+    // Search for the correct desktop file using a simple heuristic
+    int dashPos = -1;
+    QString helper = toLongAppIdIfPossible(appId);
+    QString desktopFile;
+
+    do {
+        if (dashPos != -1) {
+            helper = helper.replace(dashPos, 1, '/');
+        }
+
+        desktopFile = QStandardPaths::locate(QStandardPaths::ApplicationsLocation, QString("%1.desktop").arg(helper));
+        if (!desktopFile.isEmpty()) return desktopFile;
+
+        dashPos = helper.indexOf("-");
+    } while (dashPos != -1);
+
+    return QFileInfo();
+}
+
 } // namespace upstart
 } // namespace unitymir

=== modified file 'src/modules/Unity/Application/upstart/applicationcontroller.h'
--- src/modules/Unity/Application/upstart/applicationcontroller.h	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/upstart/applicationcontroller.h	2014-05-16 12:20:01 +0000
@@ -31,11 +31,13 @@
     ApplicationController();
     ~ApplicationController();
 
-    pid_t primaryPidForAppId(const QString& appId);
-    bool appIdHasProcessId(pid_t pid, const QString& appId);
-
-    bool stopApplicationWithAppId(const QString& appId);
-    bool startApplicationWithAppIdAndArgs(const QString& appId, const QStringList& arguments);
+    pid_t primaryPidForAppId(const QString& appId) override;
+    bool appIdHasProcessId(pid_t pid, const QString& appId) override;
+
+    bool stopApplicationWithAppId(const QString& appId) override;
+    bool startApplicationWithAppIdAndArgs(const QString& appId, const QStringList& arguments) override;
+
+    QFileInfo findDesktopFileForAppId(const QString &appId) const override;
 
 private:
     struct Private;

=== modified file 'tests/application_manager_test.cpp'
--- tests/application_manager_test.cpp	2014-04-15 14:31:02 +0000
+++ tests/application_manager_test.cpp	2014-05-16 12:20:01 +0000
@@ -82,8 +82,9 @@
     const QString appId("com.canonical.does.not.exist");
 
     EXPECT_CALL(appController, startApplicationWithAppIdAndArgs(_, _)).Times(1);
+    EXPECT_CALL(appController, findDesktopFileForAppId(appId)).Times(1);
 
-    EXPECT_CALL(desktopFileReaderFactory, createInstanceForAppId(appId)).Times(1);
+    EXPECT_CALL(desktopFileReaderFactory, createInstance(_, _)).Times(1);
 
     EXPECT_CALL(processController, sigStopProcessGroupForPid(_)).Times(1);
     EXPECT_CALL(processController, sigContinueProcessGroupForPid(_)).Times(1);
@@ -225,6 +226,85 @@
     EXPECT_EQ(beforeFailure, afterFailure);
 }
 
+TEST_F(ApplicationManagerTests,startApplicationSupportsShortAppId)
+{
+    using namespace ::testing;
+
+    const QString shortAppId("com.canonical.test_test");
+
+    EXPECT_CALL(appController, startApplicationWithAppIdAndArgs(_, _)).Times(1);
+    EXPECT_CALL(appController, findDesktopFileForAppId(shortAppId)).Times(1);
+
+    EXPECT_CALL(desktopFileReaderFactory, createInstance(_, _)).Times(1);
+
+    auto application = applicationManager.startApplication(
+                shortAppId,
+                ApplicationManager::NoFlag,
+                QStringList());
+
+    EXPECT_EQ(shortAppId, application->appId());
+}
+
+TEST_F(ApplicationManagerTests,startApplicationSupportsLongAppId)
+{
+    using namespace ::testing;
+
+    const QString longAppId("com.canonical.test_test_0.1.235");
+    const QString shortAppId("com.canonical.test_test");
+
+    EXPECT_CALL(appController, startApplicationWithAppIdAndArgs(_, _)).Times(1);
+    EXPECT_CALL(appController, findDesktopFileForAppId(shortAppId)).Times(1);
+
+    EXPECT_CALL(desktopFileReaderFactory, createInstance(_, _)).Times(1);
+
+    auto application = applicationManager.startApplication(
+                longAppId,
+                ApplicationManager::NoFlag,
+                QStringList());
+
+    EXPECT_EQ(shortAppId, application->appId());
+}
+
+TEST_F(ApplicationManagerTests,testAppIdGuessFromDesktopFileName)
+{
+    using namespace ::testing;
+    quint64 procId = 5921;
+    QString appId("sudoku-app");
+    QString cmdLine = QString("/usr/bin/my-app --desktop_file_hint=/usr/share/click/preinstalled/com.ubuntu.sudoku/1.0.180/%1.desktop").arg(appId);
+
+    EXPECT_CALL(procInfo,command_line(procId))
+        .Times(1)
+        .WillOnce(Return(qPrintable(cmdLine)));
+
+    bool authed = true;
+    applicationManager.authorizeSession(procId, authed);
+    Application *app = applicationManager.findApplication(appId);
+
+    EXPECT_EQ(true, authed);
+    EXPECT_NE(app, nullptr);
+    EXPECT_EQ(appId, app->appId());
+}
+
+TEST_F(ApplicationManagerTests,testAppIdGuessFromDesktopFileNameWithLongAppId)
+{
+    using namespace ::testing;
+    quint64 procId = 5921;
+    QString shortAppId("com.ubuntu.desktop_desktop");
+    QString cmdLine = QString("/usr/bin/my-app --desktop_file_hint=/usr/share/applications/%1_1.0.180.desktop").arg(shortAppId);
+
+    EXPECT_CALL(procInfo,command_line(procId))
+        .Times(1)
+        .WillOnce(Return(qPrintable(cmdLine)));
+
+    bool authed = true;
+    applicationManager.authorizeSession(procId, authed);
+    Application *app = applicationManager.findApplication(shortAppId);
+
+    EXPECT_EQ(true, authed);
+    EXPECT_NE(app, nullptr);
+    EXPECT_EQ(shortAppId, app->appId());
+}
+
 TEST_F(ApplicationManagerTests,bug_case_1281075_session_ptrs_always_distributed_to_last_started_app)
 {
     using namespace ::testing;
@@ -305,11 +385,13 @@
     using namespace ::testing;
     QString appId("sideStage");
 
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId);
+    EXPECT_CALL(appController, findDesktopFileForAppId(appId)).Times(1);
+
+    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
     ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
     ON_CALL(*mockDesktopFileReader, stageHint()).WillByDefault(Return("SideStage"));
 
-    ON_CALL(desktopFileReaderFactory, createInstanceForAppId(appId)).WillByDefault(Return(mockDesktopFileReader));
+    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
 
     // mock upstart launching an app which reports itself as sidestage, but we're on phone
     applicationManager.onProcessStartReportReceived(appId, false);

=== modified file 'tests/mock_application_controller.h'
--- tests/mock_application_controller.h	2014-02-28 16:51:31 +0000
+++ tests/mock_application_controller.h	2014-05-16 12:20:01 +0000
@@ -30,6 +30,7 @@
 {
     MOCK_METHOD1(primaryPidForAppId, pid_t(const QString& appId));
     MOCK_METHOD2(appIdHasProcessId, bool(pid_t, const QString&));
+    MOCK_CONST_METHOD1(findDesktopFileForAppId, QFileInfo(const QString &appId));
 
     MOCK_METHOD1(stopApplicationWithAppId, bool(const QString&));
     MOCK_METHOD2(startApplicationWithAppIdAndArgs, bool(const QString&, const QStringList&));
@@ -45,6 +46,10 @@
                 .WillByDefault(
                     Invoke(this, &MockApplicationController::doAppIdHasProcessId));
 
+        ON_CALL(*this, findDesktopFileForAppId(_))
+                .WillByDefault(
+                    Invoke(this, &MockApplicationController::doFindDesktopFileForAppId));
+
         ON_CALL(*this, stopApplicationWithAppId(_))
                 .WillByDefault(
                     Invoke(this, &MockApplicationController::doStopApplicationWithAppId));
@@ -72,6 +77,12 @@
         return it->pid() == pid;
     }
 
+    QFileInfo doFindDesktopFileForAppId(const QString& appId) const
+    {
+        QString path = QString("/usr/share/applications/%1.desktop").arg(appId);
+        return QFileInfo(path);
+    }
+
     bool doStopApplicationWithAppId(const QString& appId)
     {
         (void) appId;

=== modified file 'tests/mock_desktop_file_reader.h'
--- tests/mock_desktop_file_reader.h	2014-02-28 16:51:31 +0000
+++ tests/mock_desktop_file_reader.h	2014-05-16 12:20:01 +0000
@@ -26,38 +26,20 @@
 {
 struct MockDesktopFileReader : public unitymir::DesktopFileReader
 {
-    MockDesktopFileReader(const QString& appId)
-        : unitymir::DesktopFileReader(appId)
-    {
-        using namespace ::testing;
-
-        ON_CALL(*this, file()).WillByDefault(Invoke(this, &MockDesktopFileReader::doFile));
-        ON_CALL(*this, appId()).WillByDefault(Invoke(this, &MockDesktopFileReader::doAppId));
-        ON_CALL(*this, name()).WillByDefault(Invoke(this, &MockDesktopFileReader::doName));
-        ON_CALL(*this, comment()).WillByDefault(Invoke(this, &MockDesktopFileReader::doComment));
-        ON_CALL(*this, icon()).WillByDefault(Invoke(this, &MockDesktopFileReader::doIcon));
-        ON_CALL(*this, exec()).WillByDefault(Invoke(this, &MockDesktopFileReader::doExec));
-        ON_CALL(*this, path()).WillByDefault(Invoke(this, &MockDesktopFileReader::doPath));
-        ON_CALL(*this, stageHint()).WillByDefault(Invoke(this, &MockDesktopFileReader::doStageHint));
-        ON_CALL(*this, loaded()).WillByDefault(Invoke(this, &MockDesktopFileReader::doLoaded));
-        ON_CALL(*this, findDesktopFile(_)).WillByDefault(Invoke(this, &MockDesktopFileReader::doFindDesktopFile));
-    }
-
-    MockDesktopFileReader(const QFileInfo& fileInfo)
-        : DesktopFileReader(fileInfo)
-    {
-        using namespace ::testing;
-
-        ON_CALL(*this, file()).WillByDefault(Invoke(this, &MockDesktopFileReader::doFile));
-        ON_CALL(*this, appId()).WillByDefault(Invoke(this, &MockDesktopFileReader::doAppId));
-        ON_CALL(*this, name()).WillByDefault(Invoke(this, &MockDesktopFileReader::doName));
-        ON_CALL(*this, comment()).WillByDefault(Invoke(this, &MockDesktopFileReader::doComment));
-        ON_CALL(*this, icon()).WillByDefault(Invoke(this, &MockDesktopFileReader::doIcon));
-        ON_CALL(*this, exec()).WillByDefault(Invoke(this, &MockDesktopFileReader::doExec));
-        ON_CALL(*this, path()).WillByDefault(Invoke(this, &MockDesktopFileReader::doPath));
-        ON_CALL(*this, stageHint()).WillByDefault(Invoke(this, &MockDesktopFileReader::doStageHint));
-        ON_CALL(*this, loaded()).WillByDefault(Invoke(this, &MockDesktopFileReader::doLoaded));
-        ON_CALL(*this, findDesktopFile(_)).WillByDefault(Invoke(this, &MockDesktopFileReader::doFindDesktopFile));
+    MockDesktopFileReader(const QString &appId, const QFileInfo& fileInfo)
+        : DesktopFileReader(appId, fileInfo)
+    {
+        using namespace ::testing;
+
+        ON_CALL(*this, file()).WillByDefault(Invoke(this, &MockDesktopFileReader::doFile));
+        ON_CALL(*this, appId()).WillByDefault(Invoke(this, &MockDesktopFileReader::doAppId));
+        ON_CALL(*this, name()).WillByDefault(Invoke(this, &MockDesktopFileReader::doName));
+        ON_CALL(*this, comment()).WillByDefault(Invoke(this, &MockDesktopFileReader::doComment));
+        ON_CALL(*this, icon()).WillByDefault(Invoke(this, &MockDesktopFileReader::doIcon));
+        ON_CALL(*this, exec()).WillByDefault(Invoke(this, &MockDesktopFileReader::doExec));
+        ON_CALL(*this, path()).WillByDefault(Invoke(this, &MockDesktopFileReader::doPath));
+        ON_CALL(*this, stageHint()).WillByDefault(Invoke(this, &MockDesktopFileReader::doStageHint));
+        ON_CALL(*this, loaded()).WillByDefault(Invoke(this, &MockDesktopFileReader::doLoaded));
     }
 
     MOCK_CONST_METHOD0(file, QString());
@@ -69,7 +51,6 @@
     MOCK_CONST_METHOD0(path, QString());
     MOCK_CONST_METHOD0(stageHint, QString());
     MOCK_CONST_METHOD0(loaded, bool());
-    MOCK_CONST_METHOD1(findDesktopFile, QString(const QString&));
 
     QString doFile() const
     {
@@ -115,11 +96,6 @@
     {
         return DesktopFileReader::loaded();
     }
-
-    QString doFindDesktopFile(const QString& appId) const
-    {
-        return DesktopFileReader::findDesktopFile(appId);
-    }
 };
 
 struct MockDesktopFileReaderFactory : public unitymir::DesktopFileReader::Factory
@@ -127,38 +103,23 @@
     MockDesktopFileReaderFactory()
     {
         using namespace ::testing;
-        ON_CALL(*this, createInstanceForAppId(_))
-                .WillByDefault(
-                    Invoke(
-                        this,
-                        &MockDesktopFileReaderFactory::doCreateInstanceForAppId));
-        ON_CALL(*this, createInstanceForDesktopFile(_))
-                .WillByDefault(
-                    Invoke(
-                        this,
-                        &MockDesktopFileReaderFactory::doCreateInstanceForDesktopFile));
-    }
-
-    virtual unitymir::DesktopFileReader* doCreateInstanceForAppId(const QString& appId)
-    {
-        using namespace ::testing;
-        auto instance = new NiceMock<MockDesktopFileReader>(appId);
-        ON_CALL(*instance, loaded()).WillByDefault(Return(true));
-
-        return instance;
-    }
-
-    virtual unitymir::DesktopFileReader* doCreateInstanceForDesktopFile(const QFileInfo& fi)
-    {
-        using namespace ::testing;
-        auto instance = new NiceMock<MockDesktopFileReader>(fi);
-        ON_CALL(*instance, loaded()).WillByDefault(Return(true));
-
-        return instance;
-    }
-
-    MOCK_METHOD1(createInstanceForAppId, unitymir::DesktopFileReader*(const QString&));
-    MOCK_METHOD1(createInstanceForDesktopFile, unitymir::DesktopFileReader*(const QFileInfo&));
+        ON_CALL(*this, createInstance(_, _))
+                .WillByDefault(
+                    Invoke(
+                        this,
+                        &MockDesktopFileReaderFactory::doCreateInstance));
+    }
+
+    virtual unitymir::DesktopFileReader* doCreateInstance(const QString &appId, const QFileInfo &fi)
+    {
+        using namespace ::testing;
+        auto instance = new NiceMock<MockDesktopFileReader>(appId, fi);
+        ON_CALL(*instance, loaded()).WillByDefault(Return(true));
+
+        return instance;
+    }
+
+    MOCK_METHOD2(createInstance, unitymir::DesktopFileReader*(const QString &appId, const QFileInfo &fi));
 };
 }
 

=== modified file 'tests/taskcontroller_test.cpp'
--- tests/taskcontroller_test.cpp	2014-02-28 16:51:31 +0000
+++ tests/taskcontroller_test.cpp	2014-05-16 12:20:01 +0000
@@ -49,6 +49,8 @@
 
     MOCK_METHOD1(primaryPidForAppId, pid_t (const QString&));
     MOCK_METHOD2(appIdHasProcessId, bool(pid_t, const QString&));
+    MOCK_CONST_METHOD1(findDesktopFileForAppId, QFileInfo(const QString &appId));
+
     MOCK_METHOD1(stopApplicationWithAppId, bool(const QString&));
     MOCK_METHOD2(startApplicationWithAppIdAndArgs, bool(const QString&, const QStringList&));
 };