Unity 8

Merge lp:~lukas-kde/unity8/desktopFileActions into lp:unity8

desktopFileActions
Merge into trunk

Proposed by Lukáš Tinkl on 2015-11-02

Status:	Work in progress
Proposed branch:	lp:~lukas-kde/unity8/desktopFileActions
Merge into:	lp:unity8
Diff against target:	1174 lines (+689/-83) 16 files modified plugins/Unity/Launcher/CMakeLists.txt (+2/-0) plugins/Unity/Launcher/dbusinterface.h (+1/-2) plugins/Unity/Launcher/desktopfilehandler.cpp (+91/-40) plugins/Unity/Launcher/desktopfilehandler.h (+17/-4) plugins/Unity/Launcher/launcheritem.cpp (+7/-5) plugins/Unity/Launcher/launcheritem.h (+3/-1) plugins/Unity/Launcher/launchermodel.cpp (+26/-4) plugins/Unity/Launcher/quicklistentry.cpp (+12/-4) plugins/Unity/Launcher/quicklistentry.h (+4/-3) plugins/Unity/Launcher/quicklistmodel.cpp (+0/-9) plugins/Unity/Launcher/quicklistmodel.h (+1/-3) tests/mocks/Unity/Launcher/MockLauncherModel.cpp (+3/-2) tests/plugins/Unity/Launcher/CMakeLists.txt (+3/-1) tests/plugins/Unity/Launcher/google-chrome.desktop (+222/-0) tests/plugins/Unity/Launcher/launchermodeltest.cpp (+50/-5) tests/plugins/Unity/Launcher/thunderbird.desktop (+247/-0)
To merge this branch:	bzr merge lp:~lukas-kde/unity8/desktopFileActions
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-06-20
Michael Zanetti (community)			Needs Information on 2016-04-05
Albert Astals Cid (community)	merges fine		Abstain on 2016-03-15
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-01-04
Michael Terry		2015-11-02	Needs Fixing on 2015-11-10
Review via email: mp+276408@code.launchpad.net

Commit Message

Extend launcher quick list items with extra actions from the .desktop file

Description of the Change

Extend launcher quick list items with extra actions coming from the respective .desktop file

DesktopFileHandler now parses extra action in the Actions or X-Ayatana-Desktop-Shortcuts groups, and adds them to the launcher item's quicklist.

For example, Google Chrome gets these extra actions: "New Window" or "New Anonymous Window", Libreoffice Calc: "New spreadsheet".

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

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

N/A

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

N/A

PS Jenkins bot (ps-jenkins) wrote on 2015-11-02:

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/desktopFileActions updated on 2015-11-05

2013. By Lukáš Tinkl on 2015-11-05: merge trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-11-05:

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2015-11-09:

Comments inline. Haven't tested yet, this was just looking over the code.

review: Needs Fixing

lp:~lukas-kde/unity8/desktopFileActions updated on 2015-11-10

2014. By Lukáš Tinkl on 2015-11-10: merge trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-11-10:

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/desktopFileActions updated on 2015-11-10

2015. By Lukáš Tinkl on 2015-11-10: fix issues pointed out in review

Lukáš Tinkl (lukas-kde) wrote on 2015-11-10:

> Comments inline. Haven't tested yet, this was just looking over the code.

Issues should be fixed, tests still passing

Michael Terry (mterry) wrote on 2015-11-10:

Thanks for addressing my nits! One further inline note and then bringing some bigger issues out to the comment thread.

First, startApplication is a no-op if the application is already running. We support desktop actions on already-running apps on the desktop. I assume the spec for this feature on Touch also supports desktop actions on already-running apps.

This will seemingly require plumbing changes to allow running an app twice with different arguments. Changes in qtmir at least, which should be coordinated with Gerry.

Second, I'd like to see a test that runs through the code that launches an app. Makes sure we do launch the app, with the right arguments, and ignore the first token (instead preferring the appId).

And it should cover the "app not running" case as well as the "app already running" case.

If you had such a test, you'd run into the first issue above.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-11-10:

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/desktopFileActions updated on 2015-11-10

2016. By Lukáš Tinkl on 2015-11-10: parse and split the args using g_shell_parse_argv()

PS Jenkins bot (ps-jenkins) wrote on 2015-11-10:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-11-20:

Text conflict in tests/plugins/Unity/Launcher/launchermodeltest.cpp
1 conflicts encountered.

review: Needs Fixing

lp:~lukas-kde/unity8/desktopFileActions updated on 2015-11-20

2017. By Lukáš Tinkl on 2015-11-20: merge trunk

Lukáš Tinkl (lukas-kde) wrote on 2015-11-20:

> Text conflict in tests/plugins/Unity/Launcher/launchermodeltest.cpp
> 1 conflicts encountered.

Fixed

Albert Astals Cid (aacid) on 2015-11-20:

review: Abstain (merges fine)

PS Jenkins bot (ps-jenkins) wrote on 2015-11-20:

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/desktopFileActions updated on 2015-11-30

2018. By Lukáš Tinkl on 2015-11-30: merge trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-11-30:

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/desktopFileActions updated on 2015-12-02

2019. By Lukáš Tinkl on 2015-12-02: merge trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-12-02:

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/desktopFileActions updated on 2016-01-04

2020. By Lukáš Tinkl on 2016-01-04: merge trunk

PS Jenkins bot (ps-jenkins) wrote on 2016-01-04:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-13:

FAILED: Continuous integration, rev:2020
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/32/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/32/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-03-14:

Text conflict in plugins/Unity/Launcher/launcheritem.cpp
Text conflict in plugins/Unity/Launcher/launcheritem.h
Text conflict in plugins/Unity/Launcher/launchermodel.cpp
3 conflicts encountered.

review: Needs Fixing

lp:~lukas-kde/unity8/desktopFileActions updated on 2016-03-14

2021. By Lukáš Tinkl on 2016-03-14: merge trunk, resolve conflicts

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-14:

FAILED: Continuous integration, rev:2021
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/718/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/945
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/961
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/961
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/959/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/959/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/959/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/959/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/959/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/959/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/718/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) on 2016-03-15:

review: Abstain (merges fine)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-24:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/848/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) on 2016-04-05:

review: Needs Information

lp:~lukas-kde/unity8/desktopFileActions updated on 2016-05-12

2022. By Lukáš Tinkl on 2016-05-12: merge trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-12:

FAILED: Continuous integration, rev:2022
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1199/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1607
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1561/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1561/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1199/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-12:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1202/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/desktopFileActions updated on 2016-06-06

2023. By Lukáš Tinkl on 2016-06-06: merge trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-07:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1417/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-06-20:

Text conflict in plugins/Unity/Launcher/CMakeLists.txt
Text conflict in tests/plugins/Unity/Launcher/CMakeLists.txt
2 conflicts encountered.

lp:~lukas-kde/unity8/desktopFileActions updated on 2016-06-20

2024. By Lukáš Tinkl on 2016-06-20: merge trunk, resolve conflicts

Lukáš Tinkl (lukas-kde) wrote on 2016-06-20:

Conflicts resolved

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-20:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1553/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-08-29:

No changes since more than 2 months, i'll put it as WiP

Unmerged revisions

2024. By Lukáš Tinkl on 2016-06-20: merge trunk, resolve conflicts
2023. By Lukáš Tinkl on 2016-06-06: merge trunk
2022. By Lukáš Tinkl on 2016-05-12: merge trunk
2021. By Lukáš Tinkl on 2016-03-14: merge trunk, resolve conflicts
2020. By Lukáš Tinkl on 2016-01-04: merge trunk
2019. By Lukáš Tinkl on 2015-12-02: merge trunk
2018. By Lukáš Tinkl on 2015-11-30: merge trunk
2017. By Lukáš Tinkl on 2015-11-20: merge trunk
2016. By Lukáš Tinkl on 2015-11-10: parse and split the args using g_shell_parse_argv()
2015. By Lukáš Tinkl on 2015-11-10: fix issues pointed out in review

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/Unity/Launcher/CMakeLists.txt'
 --- plugins/Unity/Launcher/CMakeLists.txt	2016-05-13 11:14:15 +0000
 +++ plugins/Unity/Launcher/CMakeLists.txt	2016-06-20 10:00:44 +0000
@@ -1,4 +1,5 @@
  pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)
++pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
  pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
  add_definitions(-DSM_BUSNAME=systemBus)
@@ -36,6 +37,7 @@
  target_link_libraries(UnityLauncher-qml
      unity8-private
++    ${GLIB_LDFLAGS}
      ${GSETTINGS_QT_LDFLAGS}
      ${GLIB_LIBRARIES}
+     )
 === modified file 'plugins/Unity/Launcher/dbusinterface.h'
 --- plugins/Unity/Launcher/dbusinterface.h	2015-07-23 14:13:57 +0000
 +++ plugins/Unity/Launcher/dbusinterface.h	2016-06-20 10:00:44 +0000
@@ -29,7 +29,7 @@
      DBusInterface(LauncherModel *parent);
      ~DBusInterface() = default;
--    // QDBusVirtualObject implementaition
++    // QDBusVirtualObject implementation
      QString introspect (const QString &path) const override;
      bool handleMessage(const QDBusMessage& message, const QDBusConnection& connection) override;
@@ -45,5 +45,4 @@
      static QString encodeAppId(const QString& appId);
      LauncherModel *m_launcherModel;
--
  };
 === modified file 'plugins/Unity/Launcher/desktopfilehandler.cpp'
 --- plugins/Unity/Launcher/desktopfilehandler.cpp	2016-02-19 08:44:42 +0000
 +++ plugins/Unity/Launcher/desktopfilehandler.cpp	2016-06-20 10:00:44 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2014 Canonical Ltd.
++ * Copyright 2014-2015 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -13,8 +13,6 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
-- * Authors:
-- *      Michael Zanetti <michael.zanetti@canonical.com>
   */
  #include "desktopfilehandler.h"
@@ -22,8 +20,8 @@
  #include <QStringList>
  #include <QStandardPaths>
  #include <QDir>
--#include <QSettings>
  #include <QLocale>
++#include <QDebug>
  #include <libintl.h>
@@ -31,9 +29,15 @@
      QObject(parent),
      m_appId(appId)
+ {
++    m_keyFile = g_key_file_new();
      load();
+ }
++DesktopFileHandler::~DesktopFileHandler()
++{
++    g_key_file_free(m_keyFile);
++}
++
  QString DesktopFileHandler::appId() const
+ {
      return m_appId;
@@ -60,6 +64,11 @@
  void DesktopFileHandler::load()
+ {
      m_filename.clear();
++    if (!m_keyFile) {
++        g_key_file_free(m_keyFile);
++        m_keyFile = nullptr;
++    }
++    m_actions.clear();
      if (m_appId.isEmpty()) {
          return;
@@ -70,7 +79,7 @@
      QStringList searchDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
  #ifdef LAUNCHER_TESTING
--    searchDirs << QStringLiteral(".");
++    searchDirs.prepend(QStringLiteral("."));
  #endif
      QString path;
@@ -91,6 +100,8 @@
                  if (desktopFile.startsWith(helper)) {
                      QFileInfo fileInfo(searchDir, desktopFile);
                      m_filename = fileInfo.absoluteFilePath();
++                    g_key_file_load_from_file(m_keyFile, QFile::encodeName(m_filename), G_KEY_FILE_NONE, nullptr);
++                    readActionList();
                      return;
+                 }
+             }
@@ -100,38 +111,81 @@
      } while (dashPos != -1);
+ }
++void DesktopFileHandler::readActionList()
++{
++    m_actions.clear();
++    if (!isValid()) {
++        return;
++    }
++
++    QString tmp;
++    if (hasKey(G_KEY_FILE_DESKTOP_KEY_ACTIONS)) {
++        tmp = readString(G_KEY_FILE_DESKTOP_KEY_ACTIONS);
++    } else if (hasKey("X-Ayatana-Desktop-Shortcuts")) { // fallback for an old standard
++        m_usingFallbackActions = true;
++        tmp = readString("X-Ayatana-Desktop-Shortcuts");
++    }
++    if (!tmp.isEmpty()) {
++        m_actions = tmp.split(';', QString::SkipEmptyParts);
++    }
++}
++
++QList<QuickListEntry> DesktopFileHandler::actions() const
++{
++    if (!isValid() || m_actions.isEmpty()) {
++        return {};
++    }
++
++    const QString groupTemplate = m_usingFallbackActions ? QStringLiteral("%1 Shortcut Group") : QStringLiteral("Desktop Action %1");
++
++    QList<QuickListEntry> result;
++
++    Q_FOREACH(const QString &action, m_actions) {
++        QuickListEntry entry;
++        const char * groupName = qstrdup(groupTemplate.arg(action).toUtf8().constData());
++
++        entry.setActionId(QStringLiteral("exec_%1").arg(action));
++        entry.setText(readTranslatedString(G_KEY_FILE_DESKTOP_KEY_NAME, groupName));
++        entry.setIcon(readString(G_KEY_FILE_DESKTOP_KEY_ICON, groupName));
++        entry.setExec(readString(G_KEY_FILE_DESKTOP_KEY_EXEC, groupName));
++        result.append(entry);
++        delete [] groupName;
++    }
++
++    return result;
++}
++
++QString DesktopFileHandler::readTranslatedString(const char * key, const char * groupname) const
++{
++    Q_ASSERT(m_keyFile);
++    const QString original = readString(key, groupname);
++    const QString translated = g_key_file_get_locale_string(m_keyFile, groupname, key, nullptr, nullptr);
++
++    if (!translated.isEmpty() && original != translated) {
++        return translated;
++    } else if (hasKey("X-Ubuntu-Gettext-Domain")) {
++        // No translation found in desktop file. Get the untranslated one and have a go with gettext.
++        return QString::fromUtf8(dgettext(qPrintable(readString("X-Ubuntu-Gettext-Domain")), qPrintable(original)));
++    }
++
++    return original;
++}
++
++QString DesktopFileHandler::readString(const char *key, const char *groupname) const
++{
++    Q_ASSERT(m_keyFile);
++    return QString::fromUtf8(g_key_file_get_string(m_keyFile, groupname, key, nullptr));
++}
++
++bool DesktopFileHandler::hasKey(const char *key, const char *groupname) const
++{
++    Q_ASSERT(m_keyFile);
++    return g_key_file_has_key(m_keyFile, groupname, key, nullptr);
++}
++
  QString DesktopFileHandler::displayName() const
+ {
--    if (!isValid()) {
--        return QString();
--    }
--
--    QSettings settings(m_filename, QSettings::IniFormat);
--    settings.setIniCodec("UTF-8");
--    settings.beginGroup(QStringLiteral("Desktop Entry"));
--
--    // First try to find Name[xx_YY] and Name[xx] in .desktop file
--    const QString locale = QLocale().name();
--    const QStringList splitLocale = locale.split(QLatin1Char('_'));
--    const QString shortLocale = splitLocale.first();
--
--    if (locale != shortLocale && settings.contains(QStringLiteral("Name[%1]").arg(locale))) {
--        return settings.value(QStringLiteral("Name[%1]").arg(locale)).toString();
--    }
--
--    if (settings.contains(QStringLiteral("Name[%1]").arg(shortLocale))) {
--        return settings.value(QStringLiteral("Name[%1]").arg(shortLocale)).toString();
--    }
--
--    // No translation found in desktop file. Get the untranslated one and have a go with gettext.
--    QString displayName = settings.value(QStringLiteral("Name")).toString();
--
--    if (settings.contains(QStringLiteral("X-Ubuntu-Gettext-Domain"))) {
--        const QString domain = settings.value(QStringLiteral("X-Ubuntu-Gettext-Domain")).toString();
--        return dgettext(domain.toUtf8().constData(), displayName.toUtf8().constData());
--    }
--
--    return displayName;
++    return readTranslatedString(G_KEY_FILE_DESKTOP_KEY_NAME);
+ }
  QString DesktopFileHandler::icon() const
@@ -140,11 +194,8 @@
          return QString();
+     }
--    QSettings settings(m_filename, QSettings::IniFormat);
--    settings.setIniCodec("UTF-8");
--    settings.beginGroup(QStringLiteral("Desktop Entry"));
--    QString iconString = settings.value(QStringLiteral("Icon")).toString();
--    QString pathString = settings.value(QStringLiteral("Path")).toString();
++    const QString iconString = readString(G_KEY_FILE_DESKTOP_KEY_ICON);
++    const QString pathString = readString(G_KEY_FILE_DESKTOP_KEY_PATH);
      if (QFileInfo::exists(iconString)) {
          return QFileInfo(iconString).absoluteFilePath();
 === modified file 'plugins/Unity/Launcher/desktopfilehandler.h'
 --- plugins/Unity/Launcher/desktopfilehandler.h	2014-09-02 17:45:50 +0000
 +++ plugins/Unity/Launcher/desktopfilehandler.h	2016-06-20 10:00:44 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2014 Canonical Ltd.
++ * Copyright 2014-2015 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -13,18 +13,21 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
-- * Authors:
-- *      Michael Zanetti <michael.zanetti@canonical.com>
   */
  #ifndef DESKTOPFILEHANDLER_H
  #define DESKTOPFILEHANDLER_H
  #include <QObject>
++#include <QStringList>
++
++#include <glib.h>
++
++#include "quicklistentry.h"
  /**
   * When an object of this class is created or whenever setAppId(appId) is called,
-- * this will search for a .desktop file matching the give appId. If a file is
++ * this will search for a .desktop file matching the given appId. If a file is
   * found, isValid() will return true and the other methods return the contents
   * of the .desktop file.
+  *
@@ -35,8 +38,10 @@
  class DesktopFileHandler: public QObject
+ {
      Q_OBJECT
++
  public:
      DesktopFileHandler(const QString &appId = QString(), QObject *parent = nullptr);
++    ~DesktopFileHandler();
      QString appId() const;
      void setAppId(const QString &appId);
@@ -45,12 +50,20 @@
      QString filename() const;
      QString displayName() const;
      QString icon() const;
++    QList<QuickListEntry> actions() const;
  private:
      void load();
++    void readActionList();
++    QString readTranslatedString(const char * key, const char * groupname = G_KEY_FILE_DESKTOP_GROUP) const;
++    QString readString(const char * key, const char * groupname = G_KEY_FILE_DESKTOP_GROUP) const;
++    bool hasKey(const char * key, const char * groupname = G_KEY_FILE_DESKTOP_GROUP) const;
      QString m_appId;
      QString m_filename;
++    QStringList m_actions;
++    bool m_usingFallbackActions = false;
++    GKeyFile * m_keyFile = nullptr;
  };
  #endif
 === modified file 'plugins/Unity/Launcher/launcheritem.cpp'
 --- plugins/Unity/Launcher/launcheritem.cpp	2016-05-13 11:14:15 +0000
 +++ plugins/Unity/Launcher/launcheritem.cpp	2016-06-20 10:00:44 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-2015 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -13,8 +13,6 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
-- * Authors:
-- *      Michael Zanetti <michael.zanetti@canonical.com>
   */
  #include "launcheritem.h"
@@ -22,7 +20,8 @@
  #include <libintl.h>
--LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent) :
++LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon,
++                           const QList<QuickListEntry> &actions, QObject *parent) :
      LauncherItemInterface(parent),
      m_appId(appId),
      m_name(name),
@@ -38,7 +37,10 @@
      m_surfaceCount(0),
      m_quickList(new QuickListModel(this))
+ {
--    Q_ASSERT(parent != nullptr);
++    Q_ASSERT(parent != nullptr)
++    Q_FOREACH(const QuickListEntry &action, actions) {
++        m_quickList->appendAction(action);
++    }
      QuickListEntry nameAction;
      nameAction.setActionId(QStringLiteral("launch_item"));
      nameAction.setText(m_name);
 === modified file 'plugins/Unity/Launcher/launcheritem.h'
 --- plugins/Unity/Launcher/launcheritem.h	2016-05-10 15:51:00 +0000
 +++ plugins/Unity/Launcher/launcheritem.h	2016-06-20 10:00:44 +0000
@@ -32,7 +32,9 @@
+ {
      Q_OBJECT
  public:
--    LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent);
++    LauncherItem(const QString &appId, const QString &name, const QString &icon,
++                 const QList<QuickListEntry> &actions = QList<QuickListEntry>(),
++                 QObject *parent);
      QString appId() const override;
      QString name() const override;
 === modified file 'plugins/Unity/Launcher/launchermodel.cpp'
 --- plugins/Unity/Launcher/launchermodel.cpp	2016-05-19 16:11:10 +0000
 +++ plugins/Unity/Launcher/launchermodel.cpp	2016-06-20 10:00:44 +0000
@@ -29,6 +29,7 @@
  #include <QDesktopServices>
  #include <QDebug>
++#include <QFile>
  using namespace unity::shell::application;
@@ -167,6 +168,7 @@
          LauncherItem *item = new LauncherItem(appId,
                                                desktopFile.displayName(),
                                                desktopFile.icon(),
++                                              desktopFile.actions(),
                                                this);
          item->setPinned(true);
          m_list.insert(index, item);
@@ -207,6 +209,23 @@
              if (m_appManager) {
                  m_appManager->stopApplication(appId);
+             }
++        } else if (actionId.startsWith(QLatin1String("exec_"))) { // extra .desktop actions
++            const QString exec = model->get(actionIndex).exec().trimmed();
++            if (!exec.isEmpty() && m_appManager) {
++                gint argc;
++                gchar **argv = NULL;
++                if (g_shell_parse_argv(QFile::encodeName(exec).constData(), &argc, &argv, nullptr)) {
++                    QStringList arguments;
++                    for (gint i = 1; i < argc; ++i) { // split the args from the exec name
++                        gchar * arg = g_strdup(argv[i]);
++                        arguments << QString::fromUtf8(arg);
++                        g_free(arg);
++                    }
++                    // because of our security model, we just forward the args to our own binary
++                    m_appManager->startApplication(appId, arguments);
++                }
++                g_strfreev(argv);
++            }
          // Nope, we don't know this action, let the backend forward it to the application
          } else {
              // TODO: forward quicklist action to app, possibly via m_dbusIface
@@ -231,9 +250,9 @@
          return "application:///" + appId + ".desktop";
+     }
--    QStringList parts = appId.split('_');
--    QString package = parts.value(0);
--    QString app = parts.value(1, QStringLiteral("first-listed-app"));
++    const QStringList parts = appId.split('_');
++    const QString package = parts.value(0);
++    const QString app = parts.value(1, QStringLiteral("first-listed-app"));
      return "appid://" + package + "/" + app + "/current-user-version";
+ }
@@ -385,6 +404,7 @@
              LauncherItem *item = new LauncherItem(appId,
                                                    desktopFile.displayName(),
                                                    desktopFile.icon(),
++                                                  desktopFile.actions(),
                                                    this);
              item->setCountVisible(true);
              beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
@@ -461,6 +481,7 @@
              LauncherItem *item = new LauncherItem(entry,
                                                    desktopFile.displayName(),
                                                    desktopFile.icon(),
++                                                  desktopFile.actions(),
                                                    this);
              item->setPinned(true);
              beginInsertRows(QModelIndex(), addedIndex, addedIndex);
@@ -529,7 +550,8 @@
          item->setRunning(true);
      } else {
--        LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
++        DesktopFileHandler handler(app->appId(), this);
++        LauncherItem *item = new LauncherItem(handler.appId(), handler.displayName(), handler.icon(), handler.actions(), this);
          item->setRecent(true);
          item->setRunning(true);
          item->setFocused(app->focused());
 === modified file 'plugins/Unity/Launcher/quicklistentry.cpp'
 --- plugins/Unity/Launcher/quicklistentry.cpp	2015-06-09 18:37:16 +0000
 +++ plugins/Unity/Launcher/quicklistentry.cpp	2016-06-20 10:00:44 +0000
@@ -1,7 +1,5 @@
--/* Copyright (C) 2013, 2015 Canonical, Ltd.
-- *
-- * Authors:
-- *  Michael Zanetti <michael.zanetti@canonical.com>
++/*
++ * Copyright (C) 2013, 2015 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -57,6 +55,16 @@
      return !m_actionId.isEmpty();
+ }
++QString QuickListEntry::exec() const
++{
++    return m_exec;
++}
++
++void QuickListEntry::setExec(const QString &exec)
++{
++    m_exec = exec;
++}
++
  bool QuickListEntry::operator==(const QuickListEntry &other)
+ {
      return !other.actionId().isEmpty() && other.actionId() == m_actionId;
 === modified file 'plugins/Unity/Launcher/quicklistentry.h'
 --- plugins/Unity/Launcher/quicklistentry.h	2015-06-09 18:37:16 +0000
 +++ plugins/Unity/Launcher/quicklistentry.h	2016-06-20 10:00:44 +0000
@@ -1,8 +1,5 @@
  /* Copyright (C) 2013, 2015 Canonical, Ltd.
+  *
-- * Authors:
-- *  Michael Zanetti <michael.zanetti@canonical.com>
-- *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
   * the Free Software Foundation; version 3.
@@ -37,12 +34,16 @@
      bool clickable() const;
++    QString exec() const;
++    void setExec(const QString &exec);
++
      bool operator==(const QuickListEntry & other);
  private:
      QString m_actionId;
      QString m_text;
      QString m_icon;
++    QString m_exec;
  };
  #endif // QUICKLISTENTRY
 === modified file 'plugins/Unity/Launcher/quicklistmodel.cpp'
 --- plugins/Unity/Launcher/quicklistmodel.cpp	2015-06-09 18:37:16 +0000
 +++ plugins/Unity/Launcher/quicklistmodel.cpp	2016-06-20 10:00:44 +0000
@@ -12,9 +12,6 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors:
-- *      Michael Zanetti <michael.zanetti@canonical.com>
   */
  #include "quicklistmodel.h"
@@ -22,12 +19,6 @@
  QuickListModel::QuickListModel(QObject *parent) :
      QuickListModelInterface(parent)
+ {
--
--}
--
--QuickListModel::~QuickListModel()
--{
--
+ }
  void QuickListModel::appendAction(const QuickListEntry &entry)
 === modified file 'plugins/Unity/Launcher/quicklistmodel.h'
 --- plugins/Unity/Launcher/quicklistmodel.h	2015-06-09 18:37:16 +0000
 +++ plugins/Unity/Launcher/quicklistmodel.h	2016-06-20 10:00:44 +0000
@@ -13,8 +13,6 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
-- * Authors:
-- *      Michael Zanetti <michael.zanetti@canonical.com>
   */
  #ifndef QUICKLISTMODEL_H
@@ -33,7 +31,7 @@
  public:
      explicit QuickListModel(QObject *parent = 0);
--    ~QuickListModel();
++    ~QuickListModel() = default;
      void appendAction(const QuickListEntry &entry);
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
 --- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2016-06-17 01:13:55 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2016-06-20 10:00:44 +0000
@@ -80,7 +80,7 @@
      item->setFocused(true);
      item->setPinned(true);
      m_list.append(item);
--    item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);
++    item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop", "Calendar", "calendar", this);
      item->setPinned(true);
      m_list.append(item);
      item = new MockLauncherItem("libreoffice", "/usr/share/applications/libreoffice.desktop","Libre Office", "libreoffice", this);
@@ -197,7 +197,8 @@
          m_list.insert(index, new MockLauncherItem(appId,
                                                    appId + ".desktop",
                                                    appId,
--                                                  appId + ".png"));
++                                                  appId + ".png",
++                                                  this));
          m_list.at(index)->setPinned(true);
          endInsertRows();
+     }
 === modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
 --- tests/plugins/Unity/Launcher/CMakeLists.txt	2016-05-10 15:51:00 +0000
 +++ tests/plugins/Unity/Launcher/CMakeLists.txt	2016-06-20 10:00:44 +0000
@@ -1,5 +1,6 @@
  pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)
++pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
++pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
@@ -35,6 +36,7 @@
+     )
  target_link_libraries(launchermodeltestExec
      unity8-private
++    ${GLIB_LDFLAGS}
      ${GSETTINGS_QT_LDFLAGS}
      ${GLIB_LIBRARIES}
+     )
 === added file 'tests/plugins/Unity/Launcher/google-chrome.desktop'
 --- tests/plugins/Unity/Launcher/google-chrome.desktop	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/google-chrome.desktop	2016-06-20 10:00:44 +0000
@@ -0,0 +1,222 @@
++[Desktop Entry]
++Version=1.0
++Name=Google Chrome
++# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
++# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
++GenericName=Web Browser
++GenericName[ar]=متصفح الشبكة
++GenericName[bg]=Уеб браузър
++GenericName[ca]=Navegador web
++GenericName[cs]=WWW prohlížeč
++GenericName[da]=Browser
++GenericName[de]=Web-Browser
++GenericName[el]=Περιηγητής ιστού
++GenericName[en_GB]=Web Browser
++GenericName[es]=Navegador web
++GenericName[et]=Veebibrauser
++GenericName[fi]=WWW-selain
++GenericName[fr]=Navigateur Web
++GenericName[gu]=વેબ બ્રાઉઝર
++GenericName[he]=דפדפן אינטרנט
++GenericName[hi]=वेब ब्राउज़र
++GenericName[hu]=Webböngésző
++GenericName[it]=Browser Web
++GenericName[ja]=ウェブブラウザ
++GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
++GenericName[ko]=웹 브라우저
++GenericName[lt]=Žiniatinklio naršyklė
++GenericName[lv]=Tīmekļa pārlūks
++GenericName[ml]=വെബ് ബ്രൌസര്‍
++GenericName[mr]=वेब ब्राऊजर
++GenericName[nb]=Nettleser
++GenericName[nl]=Webbrowser
++GenericName[pl]=Przeglądarka WWW
++GenericName[pt]=Navegador Web
++GenericName[pt_BR]=Navegador da Internet
++GenericName[ro]=Navigator de Internet
++GenericName[ru]=Веб-браузер
++GenericName[sl]=Spletni brskalnik
++GenericName[sv]=Webbläsare
++GenericName[ta]=இணைய உலாவி
++GenericName[th]=เว็บเบราว์เซอร์
++GenericName[tr]=Web Tarayıcı
++GenericName[uk]=Навігатор Тенет
++GenericName[zh_CN]=网页浏览器
++GenericName[zh_HK]=網頁瀏覽器
++GenericName[zh_TW]=網頁瀏覽器
++# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
++GenericName[bn]=ওয়েব ব্রাউজার
++GenericName[fil]=Web Browser
++GenericName[hr]=Web preglednik
++GenericName[id]=Browser Web
++GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
++GenericName[sk]=WWW prehliadač
++GenericName[sr]=Интернет прегледник
++GenericName[te]=మహాతల అన్వేషి
++GenericName[vi]=Bộ duyệt Web
++# Gnome and KDE 3 uses Comment.
++Comment=Access the Internet
++Comment[ar]=الدخول إلى الإنترنت
++Comment[bg]=Достъп до интернет
++Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
++Comment[ca]=Accedeix a Internet
++Comment[cs]=Přístup k internetu
++Comment[da]=Få adgang til internettet
++Comment[de]=Internetzugriff
++Comment[el]=Πρόσβαση στο Διαδίκτυο
++Comment[en_GB]=Access the Internet
++Comment[es]=Accede a Internet.
++Comment[et]=Pääs Internetti
++Comment[fi]=Käytä internetiä
++Comment[fil]=I-access ang Internet
++Comment[fr]=Accéder à Internet
++Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
++Comment[he]=גישה אל האינטרנט
++Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
++Comment[hr]=Pristup Internetu
++Comment[hu]=Internetelérés
++Comment[id]=Akses Internet
++Comment[it]=Accesso a Internet
++Comment[ja]=インターネットにアクセス
++Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
++Comment[ko]=인터넷 연결
++Comment[lt]=Interneto prieiga
++Comment[lv]=Piekļūt internetam
++Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
++Comment[mr]=इंटरनेटमध्ये प्रवेश करा
++Comment[nb]=Gå til Internett
++Comment[nl]=Verbinding maken met internet
++Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
++Comment[pl]=Skorzystaj z internetu
++Comment[pt]=Aceder à Internet
++Comment[pt_BR]=Acessar a internet
++Comment[ro]=Accesaţi Internetul
++Comment[ru]=Доступ в Интернет
++Comment[sk]=Prístup do siete Internet
++Comment[sl]=Dostop do interneta
++Comment[sr]=Приступите Интернету
++Comment[sv]=Gå ut på Internet
++Comment[ta]=இணையத்தை அணுகுதல்
++Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
++Comment[th]=เข้าถึงอินเทอร์เน็ต
++Comment[tr]=İnternet'e erişin
++Comment[uk]=Доступ до Інтернету
++Comment[vi]=Truy cập Internet
++Comment[zh_CN]=访问互联网
++Comment[zh_HK]=連線到網際網路
++Comment[zh_TW]=連線到網際網路
++Exec=/usr/bin/google-chrome-stable %U
++Terminal=false
++Icon=google-chrome
++Type=Application
++Categories=Network;WebBrowser;
++MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
++X-Ayatana-Desktop-Shortcuts=NewWindow;NewIncognito
++
++[NewWindow Shortcut Group]
++Name=New Window
++Name[am]=አዲስ መስኮት
++Name[ar]=نافذة جديدة
++Name[bg]=Нов прозорец
++Name[bn]=নতুন উইন্ডো
++Name[ca]=Finestra nova
++Name[cs]=Nové okno
++Name[da]=Nyt vindue
++Name[de]=Neues Fenster
++Name[el]=Νέο Παράθυρο
++Name[en_GB]=New Window
++Name[es]=Nueva ventana
++Name[et]=Uus aken
++Name[fa]=پنجره جدید
++Name[fi]=Uusi ikkuna
++Name[fil]=New Window
++Name[fr]=Nouvelle fenêtre
++Name[gu]=નવી વિંડો
++Name[hi]=नई विंडो
++Name[hr]=Novi prozor
++Name[hu]=Új ablak
++Name[id]=Jendela Baru
++Name[it]=Nuova finestra
++Name[iw]=חלון חדש
++Name[ja]=新規ウインドウ
++Name[kn]=ಹೊಸ ವಿಂಡೊ
++Name[ko]=새 창
++Name[lt]=Naujas langas
++Name[lv]=Jauns logs
++Name[ml]=പുതിയ വിന്‍ഡോ
++Name[mr]=नवीन विंडो
++Name[nl]=Nieuw venster
++Name[no]=Nytt vindu
++Name[pl]=Nowe okno
++Name[pt]=Nova janela
++Name[pt_BR]=Nova janela
++Name[ro]=Fereastră nouă
++Name[ru]=Новое окно
++Name[sk]=Nové okno
++Name[sl]=Novo okno
++Name[sr]=Нови прозор
++Name[sv]=Nytt fönster
++Name[sw]=Dirisha Jipya
++Name[ta]=புதிய சாளரம்
++Name[te]=క్రొత్త విండో
++Name[th]=หน้าต่างใหม่
++Name[tr]=Yeni Pencere
++Name[uk]=Нове вікно
++Name[vi]=Cửa sổ Mới
++Name[zh_CN]=新建窗口
++Name[zh_TW]=開新視窗
++Exec=/usr/bin/google-chrome-stable
++TargetEnvironment=Unity
++
++[NewIncognito Shortcut Group]
++Name=New Incognito Window
++Name[ar]=نافذة جديدة للتصفح المتخفي
++Name[bg]=Нов прозорец „инкогнито“
++Name[bn]=নতুন ছদ্মবেশী উইন্ডো
++Name[ca]=Finestra d'incògnit nova
++Name[cs]=Nové anonymní okno
++Name[da]=Nyt inkognitovindue
++Name[de]=Neues Inkognito-Fenster
++Name[el]=Νέο παράθυρο για ανώνυμη περιήγηση
++Name[en_GB]=New Incognito window
++Name[es]=Nueva ventana de incógnito
++Name[et]=Uus inkognito aken
++Name[fa]=پنجره جدید حالت ناشناس
++Name[fi]=Uusi incognito-ikkuna
++Name[fil]=Bagong Incognito window
++Name[fr]=Nouvelle fenêtre de navigation privée
++Name[gu]=નવી છુપી વિંડો
++Name[hi]=नई गुप्त विंडो
++Name[hr]=Novi anoniman prozor
++Name[hu]=Új Inkognitóablak
++Name[id]=Jendela Penyamaran baru
++Name[it]=Nuova finestra di navigazione in incognito
++Name[iw]=חלון חדש לגלישה בסתר
++Name[ja]=新しいシークレット ウィンドウ
++Name[kn]=ಹೊಸ ಅಜ್ಞಾತ ವಿಂಡೋ
++Name[ko]=새 시크릿 창
++Name[lt]=Naujas inkognito langas
++Name[lv]=Jauns inkognito režīma logs
++Name[ml]=പുതിയ വേഷ പ്രച്ഛന്ന വിന്‍ഡോ
++Name[mr]=नवीन गुप्त विंडो
++Name[nl]=Nieuw incognitovenster
++Name[no]=Nytt inkognitovindu
++Name[pl]=Nowe okno incognito
++Name[pt]=Nova janela de navegação anónima
++Name[pt_BR]=Nova janela anônima
++Name[ro]=Fereastră nouă incognito
++Name[ru]=Новое окно в режиме инкогнито
++Name[sk]=Nové okno inkognito
++Name[sl]=Novo okno brez beleženja zgodovine
++Name[sr]=Нови прозор за прегледање без архивирања
++Name[sv]=Nytt inkognitofönster
++Name[ta]=புதிய மறைநிலைச் சாளரம்
++Name[te]=క్రొత్త అజ్ఞాత విండో
++Name[th]=หน้าต่างใหม่ที่ไม่ระบุตัวตน
++Name[tr]=Yeni Gizli pencere
++Name[uk]=Нове вікно в режимі анонімного перегляду
++Name[vi]=Cửa sổ ẩn danh mới
++Name[zh_CN]=新建隐身窗口
++Name[zh_TW]=新增無痕式視窗
++Exec=/usr/bin/google-chrome-stable --incognito
++TargetEnvironment=Unity
 === modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
 --- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-05-19 16:11:10 +0000
 +++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-06-20 10:00:44 +0000
@@ -176,10 +176,10 @@
          QVERIFY(addReply.isValid());
          QCOMPARE(addReply.value(), true);
--        appManager->addApplication(new MockApp("abs-icon"));
++        appManager->addApplication(new MockApp("abs-icon"), this);
          QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);
--        appManager->addApplication(new MockApp("no-icon"));
++        appManager->addApplication(new MockApp("no-icon", this));
          QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);
          launcherModel->m_settings->setStoredApplications(QStringList());
@@ -297,6 +297,51 @@
          QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);
+     }
++    void testDesktopFileHandler_data() {
++        QTest::addColumn<QString>("desktop_file");
++        QTest::addColumn<QString>("display_name");
++        QTest::addColumn<QString>("icon_name");
++        QTest::newRow("Thunderbird") << "thunderbird" // uses the current Actions= list
++                                     << "Thunderbird Mail"
++                                     << "image://theme/thunderbird";
++        QTest::newRow("Google Chrome") << "google-chrome" // uses the obsolete X-Ayatana-Desktop-Shortcuts= list
++                                       << "Google Chrome"
++                                       << "image://theme/google-chrome";
++    }
++
++    void testDesktopFileHandler() {
++        QFETCH(QString, desktop_file);
++        QFETCH(QString, display_name);
++        QFETCH(QString, icon_name);
++
++        // clear the model
++        cleanup();
++        QCOMPARE(launcherModel->rowCount(), 0);
++
++        const uint builtinEntries = 3; // launch, pin, stop
++        const QString execPrefix = QStringLiteral("exec_");
++
++        // add our test app .desktop file
++        appManager->addApplication(new MockApp(desktop_file, this));
++        QVERIFY(launcherModel->rowCount() == 1);
++        LauncherItem * item = static_cast<LauncherItem *>(launcherModel->get(0));
++        QVERIFY(item);
++        QCOMPARE(item->name(), display_name);
++        QCOMPARE(item->icon(), icon_name);
++
++        QuickListModel *quickList = qobject_cast<QuickListModel*>(item->quickList());
++        QVERIFY(quickList);
++        const uint extraEntries = quickList->rowCount() - builtinEntries;
++        QVERIFY(extraEntries > 0); // each tested app has some extra actions
++
++        for (uint i = 0; i < extraEntries; ++i) { // verify each extra action (ID, Text, and Exec)
++            QuickListEntry entry = quickList->get(i);
++            QVERIFY(entry.actionId().startsWith(execPrefix) && entry.actionId().length() > execPrefix.length());
++            QVERIFY(!entry.text().isEmpty());
++            QVERIFY(!entry.exec().isEmpty());
++        }
++    }
++
      void testQuickListPinningRemoving() {
          // we start with 2 unpinned items
          QCOMPARE(launcherModel->get(0)->pinned(), false);
@@ -429,7 +474,7 @@
          QStringList nodes = extractNodes(reply.value());
          QCOMPARE(nodes.count(), launcherModel->rowCount());
--        appManager->addApplication(new MockApp("foobar"));
++        appManager->addApplication(new MockApp("foobar", this));
          reply = interface.call("Introspect");
          nodes = extractNodes(reply.value());
          QCOMPARE(nodes.contains("foobar"), true);
@@ -543,7 +588,7 @@
          QCOMPARE(launcherModel->get(index)->countVisible(), true);
          if (!isRunning && startWhenVisible) {
--            appManager->addApplication(new MockApp("abs-icon"));
++            appManager->addApplication(new MockApp("abs-icon", this));
+         }
          // Hide count emblem again
@@ -652,7 +697,7 @@
          QCOMPARE(launcherModel->rowCount(), getASConfig().count());
          int oldCount = launcherModel->rowCount();
--        appManager->addApplication(new MockApp("rel-icon"));
++        appManager->addApplication(new MockApp("rel-icon", this));
          QCOMPARE(launcherModel->rowCount(), oldCount + 1);
          QCOMPARE(launcherModel->rowCount(), getASConfig().count());
+     }
 === added file 'tests/plugins/Unity/Launcher/thunderbird.desktop'
 --- tests/plugins/Unity/Launcher/thunderbird.desktop	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/thunderbird.desktop	2016-06-20 10:00:44 +0000
@@ -0,0 +1,247 @@
++[Desktop Entry]
++Encoding=UTF-8
++Name=Thunderbird Mail
++Name[ast]=Veceru de corréu Thunderbird
++Name[ca]=Client de correu Thunderbird
++Name[cs]=Poštovní klient Thunderbird
++Name[da]=Mozilla Thunderbird - e-post/nyhedsgruppe
++Name[de]=Thunderbird-E-Mail und -Nachrichten
++Name[el]=Ηλεκτρονική αλληλογραφία Thunderbird
++Name[es]=Cliente de correo Thunderbird
++Name[fi]=Thunderbird-sähköposti
++Name[fr]=Messagerie Thunderbird
++Name[gl]=Cliente de correo Thunderbird
++Name[he]=Mozilla Thunderbird דוא״ל/חדשות
++Name[hr]=Mozilla Thunderbird e-pošta/novosti
++Name[hu]=Thunderbird levelezőkliens
++Name[it]=Email Mozilla Thunderbird
++Name[ja]=Thunderbird電子メールクライアント
++Name[ko]=Mozilla Thunderbird
++Name[nl]=Mozilla Thunderbird e-mail/nieuws
++Name[pl]=Klient poczty Thunderbird
++Name[pt_BR]=Cliente de E-mail Thunderbird
++Name[ru]=Почтовый клиент Thunderbird
++Name[sk]=Thunderbird - poštový klient
++Name[sv]=E-postklienten Thunderbird
++Name[ug]=Mozilla Thunderbird ئېلخەت/خەۋەر
++Name[uk]=Поштова програма Thunderbird
++Name[vi]=Trình điện thư Mozilla Thunderbird
++Name[zh_CN]=Thunderbird 邮件/新闻
++Name[zh_TW]=Thunderbird 郵件
++Comment=Send and receive mail with Thunderbird
++Comment[ast]=Lleer y escribir corréu electrónicu
++Comment[ca]=Llegiu i escriviu correu
++Comment[cs]=Čtení a psaní pošty
++Comment[da]=Skriv/læs e-post/nyhedsgruppe med Mozilla Thunderbird
++Comment[de]=E-Mails und Nachrichten mit Thunderbird lesen und schreiben
++Comment[el]=Διαβάστε και γράψτε γράμματα με το Mozilla Thunderbird
++Comment[es]=Lea y escriba correos y noticias con Thunderbird
++Comment[fi]=Lue ja kirjoita sähköposteja
++Comment[fr]=Lire et écrire des courriels
++Comment[gl]=Lea e escriba correo electrónico
++Comment[he]=קריאה/כתיבה של דוא״ל/חדשות באמצעות Mozilla Thunderbird
++Comment[hr]=Čitajte/šaljite e-poštu s Thunderbird
++Comment[hu]=Levelek írása és olvasása a Thunderbirddel
++Comment[it]=Per leggere e scrivere email
++Comment[ja]=メールの読み書き
++Comment[ko]=Mozilla Thunderbird 메일/뉴스 읽기 및 쓰기 클라이언트
++Comment[nl]=E-mail/nieuws lezen en schrijven met Mozilla Thunderbird
++Comment[pl]=Czytanie i wysyłanie e-maili
++Comment[pt_BR]=Leia e escreva suas mensagens
++Comment[ru]=Читайте и пишите письма
++Comment[sk]=Čítajte a píšte poštu pomocou programu Thunderbird
++Comment[sv]=Läs och skriv e-post
++Comment[ug]=ئېلخەت ۋە خەۋەرلەرنى Mozilla Thunderbird دا كۆرۈش ۋە يېزىش
++Comment[uk]=Читання та написання листів
++Comment[vi]=Đọc và soạn thư điện tử
++Comment[zh_CN]=阅读邮件或新闻
++Comment[zh_TW]=以 Mozilla Thunderbird 讀寫郵件或新聞
++GenericName=Mail Client
++GenericName[ast]=Client de correu
++GenericName[ca]=Client de correu
++GenericName[cs]=Poštovní klient
++GenericName[da]=E-postklient
++GenericName[de]=E-Mail-Anwendung
++GenericName[el]=Λογισμικό αλληλογραφίας
++GenericName[es]=Cliente de correo
++GenericName[fi]=Sähköpostiohjelma
++GenericName[fr]=Client de messagerie
++GenericName[gl]=Cliente de correo electrónico
++GenericName[he]=לקוח דוא״ל
++GenericName[hr]=Klijent e-pošte
++GenericName[hu]=Levelezőkliens
++GenericName[it]=Client email
++GenericName[ja]=電子メールクライアント
++GenericName[ko]=메일 클라이언트
++GenericName[nl]=E-mailprogramma
++GenericName[pt_BR]=Cliente de E-mail
++GenericName[ru]=Почтовый клиент
++GenericName[sk]=Poštový klient
++GenericName[ug]=ئېلخەت دېتالى
++GenericName[uk]=Поштова програма
++GenericName[vi]=Phần mềm khách quản lý thư điện tử
++GenericName[zh_CN]=邮件新闻客户端
++GenericName[zh_TW]=郵件用戶端
++Keywords=Email;E-mail;Newsgroup;Feed;RSS
++Keywords[ast]=Corréu;Corréu-e;Noticies;Discusiones;Mensaxes;Canales;RSS
++Keywords[ca]=Correu;Email;E-mail;Mailing;Llistes;Notícies;RSS
++Keywords[cs]=Email;E-mail;Pošta;Elektronická pošta;Diskusní skupiny;Čtečka;RSS
++Keywords[da]=Email;E-mail;Epost;E-post;E-brev;Newsgroup;Nyhedsgruppe;Nyhedskilde;Usenet;Feed;RSS
++Keywords[de]=Mail;E-Mail;Newsgroup;Nachrichten;Feed;RSS;Post;News;Usenet;online;lesen;schreiben
++Keywords[el]=Email;E-mail;Newsgroup;Feed;RSS;ημαιλ;Αλληλογραφία;Ροή;ΡΣΣ;Συζητήσεις;Γράμματα
++Keywords[es]=Email;Correo electrónico;Noticias;Discusiones;Mensajes;Canales;RSS
++Keywords[fi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;posti;sähköposti;maili;meili;Usenet;uutisryhmät;syöte
++Keywords[fr]=Mails;Mels;E-Mails;Emails;Courriels;Courriers;Newsgroup;Feed;RSS;Poster;Thunderbird;Lire;Écrire
++Keywords[he]=דוא"ל;דוא״ל;מייל;אי-מייל;אימייל;הודעות;מוזילה;תאנדרבירד;ת׳אנדרבירד;ת'אנדרבירד;ת׳אנדרברד;ת'אנדרברד;דואל;
++Keywords[hr]=email;e-mail;e-pošta;pošta;RSS
++Keywords[hu]=Email;E-mail;Levél;Levelezés;Hírcsoport;Feed;Hírforrás;RSS
++Keywords[it]=Email;Mail;Posta;Newsgroup;Feed;RSS
++Keywords[is]=tölvupóstur;rafpóstur;fréttir;fréttahópar;samtöl;skilaboð;fréttastraumar;RSS
++Keywords[ja]=Eメール;イーメール;mail;e-mail;email;メール;電子メール;ニュースグループ;ネットニュース;RSS;フィードリーダー;書く;読む;Mozilla
++Keywords[nl]=Email;E-mail;Newsgroup;Feed;RSS;Nieuwsgroep;Post
++Keywords[ru]=Email;E-mail;Newsgroup;Feed;RSS;почта;письма;новости;фиды
++Keywords[sk]=Email;E-mail;Elektronická pošta;Diskusné skupiny;Čítačka kanálov;RSS
++Keywords[uk]=Email;E-mail;Newsgroup;Feed;RSS;пошта;новини;подачі;стрічка
++Keywords[vi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;Thư điện tử;Gửi thư
++Keywords[zh_CN]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;电子;邮件;新闻;Thunderbird;tb;雷鸟;电邮;邮箱;阅读器;
++Exec=thunderbird %u
++Terminal=false
++X-MultipleArgs=false
++Type=Application
++Icon=thunderbird
++Categories=Application;Network;Email;
++MimeType=x-scheme-handler/mailto;application/x-xpinstall;
++StartupNotify=true
++Actions=Compose;Contacts
++
++[Desktop Action Compose]
++Name=Compose New Message
++Name[af]=Skryf 'n nuwe boodskap
++Name[ar]=حرر رسالة جديدة
++Name[ast]=Redactar un mensaxe nuevu
++Name[be]=Напісаць ліст
++Name[bg]=Ново писмо
++Name[bn]=নতুন বার্তা লিখুন
++Name[br]=Sevel ur gemennadenn nevez
++Name[bs]=Napiši novu poruku
++Name[ca]=Redacta un missatge nou
++Name[cs]=Napsat novou zprávu
++Name[cy]=Cyfansoddi Neges Newydd
++Name[da]=Skriv en ny besked
++Name[de]=Neue Nachricht erstellen
++Name[el]=Σύνταξη νέου μηνύματος
++Name[eo]=Redakti novan mesaĝon
++Name[es]=Redactar un mensaje nuevo
++Name[et]=Koosta uus sõnum
++Name[eu]=Mezu Berria Idatzi
++Name[fi]=Luo uusi viesti
++Name[fr]=Rédiger un nouveau courriel
++Name[gd]=Co-chuir Teachdaireachd Ùr
++Name[gl]=Redactar unha nova mensaxe
++Name[he]=חיבור הודעה חדשה
++Name[hi]=नया संदेश लिखें
++Name[hr]=Nova poruka
++Name[hu]=Új üzenet írása
++Name[hy]=Նամակ գրել
++Name[id]=Buat Pesan Baru
++Name[is]=Skrifa nýtt bréf
++Name[it]=Componi nuovo messaggio
++Name[ja]=新しいメッセージの作成
++Name[kk]=Жаңа хат жазу
++Name[kn]=ಹೊಸ ಸಂದೇಶವನ್ನು ಸಂಯೋಜಿಸು
++Name[ko]=새 메시지 쓰기
++Name[ku]=Peyameke nû biafirînê
++Name[lt]=Rašyti naują laišką
++Name[lv]=Sacerēt jaunu vēstuli
++Name[mk]=Состави нова порака
++Name[ml]=പുതിയ സന്ദേശം രചിക്കുക
++Name[mr]=नवीन संदेश लिहा.
++Name[nb]=Skriv en ny melding
++Name[nl]=Nieuw bericht opstellen
++Name[nn]=Skriv ei ny melding
++Name[pl]=Utwórz nową wiadomość
++Name[pt]=Criar nova mensagem
++Name[pt_BR]=Compor nova mensagem
++Name[ro]=Compune un mesaj nou
++Name[ru]=Написать письмо
++Name[si]=නව පණිවිඩයක් අරඹන්න
++Name[sk]=Napísať novú správu
++Name[sl]=Sestavi novo sporočilo
++Name[sq]=Krijo Mesazh të Ri
++Name[sr]=Састави нову поруку
++Name[sv]=Skriv nytt meddelande
++Name[ta]=புதிய செய்தியை உருவாக்கு
++Name[te]=కొత్త సందేశాన్ని రచించు
++Name[th]=สร้างข้อความใหม่
++Name[tr]=Yeni İleti Oluştur
++Name[uk]=Написати нове повідомлення
++Name[zh_CN]=撰写新消息
++Name[zh_TW]=撰寫新郵件
++Exec=thunderbird -compose
++OnlyShowIn=Messaging Menu;Unity;
++
++[Desktop Action Contacts]
++Name=Contacts
++Name[af]=Kontakte
++Name[ar]=المتراسلين
++Name[ast]=Contautos
++Name[be]=Кантакты
++Name[bg]=Контакти
++Name[bn]=পরিচিতি সমূহ
++Name[br]=Darempredoù
++Name[bs]=Kontakti
++Name[ca]=Contactes
++Name[cs]=Kontakty
++Name[cy]=Cysylltiadau
++Name[da]=Kontakter
++Name[de]=Kontakte
++Name[el]=Επαφές
++Name[eo]=Kontaktoj
++Name[es]=Contactos
++Name[et]=Kontaktid
++Name[eu]=Kontaktuak
++Name[fi]=Yhteystiedot
++Name[fr]=Carnet d'adresses
++Name[gd]=Buntanasan
++Name[gl]=Contactos
++Name[he]=אנשי קשר
++Name[hi]=संपर्क
++Name[hr]=Kontakti
++Name[hu]=Névjegyek
++Name[hy]=Կապորդներ
++Name[id]=Kontak
++Name[is]=Tengiliðir
++Name[it]=Contatti
++Name[ja]=連絡先
++Name[kk]=Байланыс жазулары
++Name[kn]=ಸಂಪರ್ಕಗಳು
++Name[ko]=연락처
++Name[ku]=Tekilî
++Name[lt]=Kontaktai
++Name[lv]=Kontakti
++Name[mk]=Контакти
++Name[ml]=വിലാസങ്ങള്‍
++Name[mr]=संपर्क
++Name[nb]=Kontakter
++Name[nl]=Contacten
++Name[nn]=Kontaktar
++Name[pl]=Kontakty
++Name[pt]=Contactos
++Name[pt_BR]=Contatos
++Name[ro]=Contacte
++Name[ru]=Контакты
++Name[si]=සබඳතා
++Name[sk]=Kontakty
++Name[sl]=Stiki
++Name[sq]=Kontaktet
++Name[sr]=Контакти
++Name[sv]=Kontakter
++Name[ta]=தொடர்புகள்
++Name[te]=పరిచయాలు
++Name[th]=รายชื่อติดต่อ
++Name[tr]=Kişiler
++Name[uk]=Контакти
++Name[zh_CN]=联系人
++Name[zh_TW]=連絡人
++Exec=thunderbird -addressbook
++OnlyShowIn=Messaging Menu;Unity;