Unity 8

Merge lp:~unity-team/unity8/ual-launcher into lp:unity8

ual-launcher
Merge into trunk

Proposed by Michael Terry on 2016-09-22

Status:	Merged
Approved by:	Albert Astals Cid on 2016-09-29
Approved revision:	2616
Merged at revision:	2660
Proposed branch:	lp:~unity-team/unity8/ual-launcher
Merge into:	lp:unity8
Diff against target:	804 lines (+115/-294) 15 files modified CMakeLists.txt (+1/-1) debian/control (+1/-0) plugins/Unity/Launcher/CMakeLists.txt (+8/-3) plugins/Unity/Launcher/desktopfilehandler.cpp (+0/-155) plugins/Unity/Launcher/desktopfilehandler.h (+0/-56) plugins/Unity/Launcher/launchermodel.cpp (+53/-26) plugins/Unity/Launcher/launchermodel.h (+17/-8) tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt (+0/-1) tests/plugins/Unity/Launcher/CMakeLists.txt (+12/-20) tests/plugins/Unity/Launcher/applications/abs-icon.desktop (+1/-0) tests/plugins/Unity/Launcher/applications/click-icon.desktop (+1/-0) tests/plugins/Unity/Launcher/applications/no-name.desktop (+1/-0) tests/plugins/Unity/Launcher/applications/rel-icon.desktop (+1/-0) tests/plugins/Unity/Launcher/launchermodeltest.cpp (+19/-22) tests/plugins/Unity/Launcher/no-icon.desktop (+0/-2)
To merge this branch:	bzr merge lp:~unity-team/unity8/ual-launcher
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Abstain on 2016-09-29
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-09-28
Michael Zanetti (community)		2016-09-22	Approve on 2016-09-23
Review via email: mp+306539@code.launchpad.net

Commit message

Grab launcher icon information from ubuntu-app-launch, not directly from desktop files.

Description of the change

This is mostly expected. A few odd changes I've made to the testing code:

- I switched from no-icon to rel-icon as the 2nd standard app in the tests. This is because UAL refuses to handle apps without an icon. A harsh but not unreasonable policy. I did not add a test for the no-icon case, since it felt more like a test UAL should have (and probably does have) than us.

- Added Type=Application to the test desktop files. UAL won't read them without it.

- For the tests to find the sample desktop files, I've moved them to an applications subdir and set XDG_DATA_HOME, which is where UAL will look for them.

== Checklist ==

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

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, I ran u8 with this change and saw the same launcher icons I saw without this branch.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
I'm on the team.

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

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-09-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-09-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-09-23:

thanks for the small refactorings I asked for in IRC.

tested it on turbo (after merging with silo 78). Works fine.

Not entirely sure what's going on with CI...

review: Approve

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-09-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-09-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2016-09-28:

Note: was top approved already

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing

lp:~unity-team/unity8/ual-launcher updated on 2016-09-28

2616. By Michael Terry on 2016-09-28: Merge trunk

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-09-28:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

re-top-approving after merge since it was already top approved

review: Abstain

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:

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-09-07 08:36:59 +0000
 +++ CMakeLists.txt	2016-09-28 15:23:28 +0000
@@ -63,7 +63,7 @@
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
  pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
  pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)
--
++pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2)
  pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
  ### Check UbuntuGestures private headers. No pkg-config (.pc) file is provided for them
 === modified file 'debian/control'
 --- debian/control	2016-09-07 08:36:59 +0000
 +++ debian/control	2016-09-28 15:23:28 +0000
@@ -32,6 +32,7 @@
                 libqt5svg5-dev,
                 libqt5xmlpatterns5-dev,
                 libsystemsettings-dev,
++               libubuntu-app-launch2-dev,
                 libubuntu-download-manager-common-dev,
                 libubuntugestures5-dev (>= 1.3.2030),
                 libubuntugestures5-private-dev (>= 1.3.2030),
 === 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-09-28 15:23:28 +0000
@@ -6,10 +6,15 @@
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/plugins/AccountsService
++    ${libunity8-private_SOURCE_DIR}
++)
++
++include_directories(
++    SYSTEM
      ${GSETTINGS_QT_INCLUDE_DIRS}
      ${GLIB_INCLUDE_DIRS}
--    ${libunity8-private_SOURCE_DIR}
--)
++    ${UAL_INCLUDE_DIRS}
++    )
  set(QMLLAUNCHERPLUGIN_SRC
      plugin.cpp
@@ -19,7 +24,6 @@
      quicklistentry.cpp
      dbusinterface.cpp
      gsettings.cpp
--    desktopfilehandler.cpp
      asadapter.cpp
      ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
@@ -38,6 +42,7 @@
      unity8-private
      ${GSETTINGS_QT_LDFLAGS}
      ${GLIB_LIBRARIES}
++    ${UAL_LIBRARIES}
+     )
  qt5_use_modules(UnityLauncher-qml DBus Qml Gui)
 === removed file 'plugins/Unity/Launcher/desktopfilehandler.cpp'
 --- plugins/Unity/Launcher/desktopfilehandler.cpp	2016-02-19 08:44:42 +0000
 +++ plugins/Unity/Launcher/desktopfilehandler.cpp	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
--/*
-- * Copyright 2014 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
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * 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"
--
--#include <QStringList>
--#include <QStandardPaths>
--#include <QDir>
--#include <QSettings>
--#include <QLocale>
--
--#include <libintl.h>
--
--DesktopFileHandler::DesktopFileHandler(const QString &appId, QObject *parent):
--    QObject(parent),
--    m_appId(appId)
--{
--    load();
--}
--
--QString DesktopFileHandler::appId() const
--{
--    return m_appId;
--}
--
--void DesktopFileHandler::setAppId(const QString &appId)
--{
--    if (m_appId != appId) {
--        m_appId = appId;
--        load();
--    }
--}
--
--QString DesktopFileHandler::filename() const
--{
--    return m_filename;
--}
--
--bool DesktopFileHandler::isValid() const
--{
--    return !m_filename.isEmpty();
--}
--
--void DesktopFileHandler::load()
--{
--    m_filename.clear();
--
--    if (m_appId.isEmpty()) {
--        return;
--    }
--
--    int dashPos = -1;
--    QString helper = m_appId;
--
--    QStringList searchDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
--#ifdef LAUNCHER_TESTING
--    searchDirs << QStringLiteral(".");
--#endif
--
--    QString path;
--    do {
--        if (dashPos != -1) {
--            helper.replace(dashPos, 1, '/');
--        }
--
--        if (helper.contains('/')) {
--            path += helper.split('/').at(0) + '/';
--            helper.remove(QRegExp("^" + path));
--        }
--
--        Q_FOREACH(const QString &searchDirName, searchDirs) {
--            QDir searchDir(searchDirName + "/" + path);
--            const QString desktop = QStringLiteral("*.desktop");
--            Q_FOREACH(const QString &desktopFile, searchDir.entryList(QStringList() << desktop)) {
--                if (desktopFile.startsWith(helper)) {
--                    QFileInfo fileInfo(searchDir, desktopFile);
--                    m_filename = fileInfo.absoluteFilePath();
--                    return;
--                }
--            }
--        }
--
--        dashPos = helper.indexOf('-');
--    } while (dashPos != -1);
--}
--
--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;
--}
--
--QString DesktopFileHandler::icon() const
--{
--    if (!isValid()) {
--        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();
--
--    if (QFileInfo::exists(iconString)) {
--        return QFileInfo(iconString).absoluteFilePath();
--    } else if (QFileInfo::exists(pathString + '/' + iconString)) {
--        return pathString + '/' + iconString;
--    }
--    return "image://theme/" + iconString;
--}
 === removed file 'plugins/Unity/Launcher/desktopfilehandler.h'
 --- plugins/Unity/Launcher/desktopfilehandler.h	2014-09-02 17:45:50 +0000
 +++ plugins/Unity/Launcher/desktopfilehandler.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
--/*
-- * Copyright 2014 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
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * 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>
--
--/**
-- * 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
-- * found, isValid() will return true and the other methods return the contents
-- * of the .desktop file.
-- *
-- * Note that this class will consider the user's locale and do a best effort
-- * to return localized values.
-- */
--
--class DesktopFileHandler: public QObject
--{
--    Q_OBJECT
--public:
--    DesktopFileHandler(const QString &appId = QString(), QObject *parent = nullptr);
--
--    QString appId() const;
--    void setAppId(const QString &appId);
--
--    bool isValid() const;
--    QString filename() const;
--    QString displayName() const;
--    QString icon() const;
--
--private:
--    void load();
--
--    QString m_appId;
--    QString m_filename;
--};
--
--#endif
 === modified file 'plugins/Unity/Launcher/launchermodel.cpp'
 --- plugins/Unity/Launcher/launchermodel.cpp	2016-07-07 16:18:59 +0000
 +++ plugins/Unity/Launcher/launchermodel.cpp	2016-09-28 15:23:28 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013-2014 Canonical Ltd.
++ * Copyright 2013-2016 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
@@ -12,24 +12,25 @@
+  *
   * 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 "launchermodel.h"
  #include "launcheritem.h"
  #include "gsettings.h"
--#include "desktopfilehandler.h"
  #include "dbusinterface.h"
  #include "asadapter.h"
++#include <ubuntu-app-launch/appid.h>
++#include <ubuntu-app-launch/application.h>
++#include <ubuntu-app-launch/registry.h>
  #include <unity/shell/application/ApplicationInfoInterface.h>
  #include <unity/shell/application/MirSurfaceListInterface.h>
  #include <QDesktopServices>
  #include <QDebug>
++namespace ual = ubuntu::app_launch;
++
  using namespace unity::shell::application;
  LauncherModel::LauncherModel(QObject *parent):
@@ -37,7 +38,8 @@
      m_settings(new GSettings(this)),
      m_dbusIface(new DBusInterface(this)),
      m_asAdapter(new ASAdapter()),
--    m_appManager(nullptr)
++    m_appManager(nullptr),
++    m_ualRegistry(std::make_shared<ual::Registry>())
+ {
      connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
      connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
@@ -157,16 +159,16 @@
              index = m_list.count();
+         }
--        DesktopFileHandler desktopFile(appId);
--        if (!desktopFile.isValid()) {
--            qWarning() << "Can't pin this application, there is no .desktop file available.";
++        auto appInfo = getApplicationInfo(appId);
++        if (!appInfo.valid) {
++            qWarning() << "Can't pin application, appId not found:" << appId;
              return;
+         }
          beginInsertRows(QModelIndex(), index, index);
          LauncherItem *item = new LauncherItem(appId,
--                                              desktopFile.displayName(),
--                                              desktopFile.icon(),
++                                              appInfo.name,
++                                              appInfo.icon,
                                                this);
          item->setPinned(true);
          m_list.insert(index, item);
@@ -333,6 +335,32 @@
      return -1;
+ }
++LauncherModel::AppInfo LauncherModel::getApplicationInfo(const QString &appId)
++{
++    AppInfo info;
++
++    ual::AppID ualAppId = ual::AppID::find(m_ualRegistry, appId.toStdString());
++    if (ualAppId.empty()) {
++        return info;
++    }
++
++    std::shared_ptr<ual::Application> ualApp;
++    try
++    {
++        ualApp = ual::Application::create(ualAppId, m_ualRegistry);
++    }
++    catch (std::runtime_error &e)
++    {
++        qWarning() << "Couldn't find application info for" << appId << "-" << e.what();
++        return info;
++    }
++
++    info.valid = true;
++    info.name = QString::fromStdString(ualApp->info()->name());
++    info.icon = QString::fromStdString(ualApp->info()->iconPath());
++    return info;
++}
++
  void LauncherModel::progressChanged(const QString &appId, int progress)
+ {
      const int idx = findApplication(appId);
@@ -380,11 +408,11 @@
+         }
      } else {
          // Need to create a new LauncherItem and show the highlight
--        DesktopFileHandler desktopFile(appId);
--        if (countVisible && desktopFile.isValid()) {
++        auto appInfo = getApplicationInfo(appId);
++        if (countVisible && appInfo.valid) {
              LauncherItem *item = new LauncherItem(appId,
--                                                  desktopFile.displayName(),
--                                                  desktopFile.icon(),
++                                                  appInfo.name,
++                                                  appInfo.icon,
                                                    this);
              item->setCountVisible(true);
              beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
@@ -400,28 +428,28 @@
      // First walk through all the existing items and see if we need to remove something
      QList<LauncherItem*> toBeRemoved;
      Q_FOREACH (LauncherItem* item, m_list) {
--        DesktopFileHandler desktopFile(item->appId());
--        if (!desktopFile.isValid()) {
--            // Desktop file not available for this app => drop it!
++        auto appInfo = getApplicationInfo(item->appId());
++        if (!appInfo.valid) {
++            // Application no longer available => drop it!
              toBeRemoved << item;
          } else if (!m_settings->storedApplications().contains(item->appId())) {
              // Item not in settings any more => drop it!
              toBeRemoved << item;
          } else {
              int idx = m_list.indexOf(item);
--            item->setName(desktopFile.displayName());
++            item->setName(appInfo.name);
              item->setPinned(item->pinned()); // update pinned text if needed
              item->setRunning(item->running());
              Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleRunning});
              const QString oldIcon = item->icon();
--            if (oldIcon == desktopFile.icon()) { // same icon file, perhaps different contents, simulate changing the icon name to force reload
++            if (oldIcon == appInfo.icon) { // same icon file, perhaps different contents, simulate changing the icon name to force reload
                  item->setIcon(QString());
                  Q_EMIT dataChanged(index(idx), index(idx), {RoleIcon});
+             }
              // now set the icon for real
--            item->setIcon(desktopFile.icon());
++            item->setIcon(appInfo.icon);
              Q_EMIT dataChanged(index(idx), index(idx), {RoleIcon});
+         }
+     }
@@ -452,15 +480,14 @@
          if (itemIndex == -1) {
              // Need to add it. Just add it into the addedIndex to keep same ordering as the list
              // in the settings.
--            DesktopFileHandler desktopFile(entry);
--            if (!desktopFile.isValid()) {
--                qWarning() << "Couldn't find a .desktop file for" << entry << ". Skipping...";
++            auto appInfo = getApplicationInfo(entry);
++            if (!appInfo.valid) {
                  continue;
+             }
              LauncherItem *item = new LauncherItem(entry,
--                                                  desktopFile.displayName(),
--                                                  desktopFile.icon(),
++                                                  appInfo.name,
++                                                  appInfo.icon,
                                                    this);
              item->setPinned(true);
              beginInsertRows(QModelIndex(), addedIndex, addedIndex);
 === modified file 'plugins/Unity/Launcher/launchermodel.h'
 --- plugins/Unity/Launcher/launchermodel.h	2016-05-13 11:14:15 +0000
 +++ plugins/Unity/Launcher/launchermodel.h	2016-09-28 15:23:28 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013-2014 Canonical Ltd.
++ * Copyright 2013-2016 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
@@ -12,14 +12,11 @@
+  *
   * 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 LAUNCHERMODEL_H
--#define LAUNCHERMODEL_H
++#pragma once
++#include <memory>
  #include <unity/shell/launcher/LauncherModelInterface.h>
  #include <unity/shell/application/ApplicationManagerInterface.h>
@@ -30,6 +27,12 @@
  class DBusInterface;
  class ASAdapter;
++namespace ubuntu {
++    namespace app_launch {
++        class Registry;
++    }
++}
++
  using namespace unity::shell::launcher;
  using namespace unity::shell::application;
@@ -70,6 +73,13 @@
      void unpin(const QString &appId);
++    struct AppInfo {
++        bool valid = false;
++        QString name;
++        QString icon;
++    };
++    AppInfo getApplicationInfo(const QString &appId);
++
  private Q_SLOTS:
      void countChanged(const QString &appId, int count);
      void countVisibleChanged(const QString &appId, bool count);
@@ -88,8 +98,7 @@
      ASAdapter *m_asAdapter;
      ApplicationManagerInterface *m_appManager;
++    std::shared_ptr<ubuntu::app_launch::Registry> m_ualRegistry;
      friend class LauncherModelTest;
  };
--
--#endif // LAUNCHERMODEL_H
 === modified file 'tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt'
 --- tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-10-26 14:05:14 +0000
 +++ tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt	2016-09-28 15:23:28 +0000
@@ -10,7 +10,6 @@
  add_definitions(-DSM_BUSNAME=sessionBus)
  add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
--add_definitions(-DLAUNCHER_TESTING)
  ### LauncherModelASTest
  add_executable(launchermodelastestExec
 === 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-09-28 15:23:28 +0000
@@ -6,14 +6,18 @@
      ${CMAKE_CURRENT_BINARY_DIR}
      ${CMAKE_SOURCE_DIR}/plugins/AccountsService
      ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher
++    ${libunity8-private_SOURCE_DIR}
++    )
++
++include_directories(
++    SYSTEM
      ${GSETTINGS_QT_INCLUDE_DIRS}
      ${GLIB_INCLUDE_DIRS}
--    ${libunity8-private_SOURCE_DIR}
++    ${UAL_INCLUDE_DIRS}
+     )
  add_definitions(-DSM_BUSNAME=sessionBus)
  add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
--add_definitions(-DLAUNCHER_TESTING)
  ### LauncherModelTest
  add_executable(launchermodeltestExec
@@ -25,7 +29,6 @@
      ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/dbusinterface.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/desktopfilehandler.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistentry.cpp
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
@@ -37,11 +40,13 @@
      unity8-private
      ${GSETTINGS_QT_LDFLAGS}
      ${GLIB_LIBRARIES}
++    ${UAL_LIBRARIES}
+     )
  add_dependencies(launchermodeltestExec mock-server)
  qt5_use_modules(launchermodeltestExec Test Core DBus Xml Gui)
  add_unity8_unittest(LauncherModel dbus-test-runner
++    ENVIRONMENT "XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}"
      ARG_PREFIX "--parameter"
      ARGS
          --task $<TARGET_FILE:mock-server>
@@ -50,20 +55,7 @@
          --wait-for org.freedesktop.Accounts
+ )
--# copy .desktop files into build directory for shadow builds
--file(GLOB DESKTOP_FILES *.desktop)
--
--foreach(DESKTOP_FILE ${DESKTOP_FILES})
--    file(COPY "${DESKTOP_FILE}"
--        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
--        )
--endforeach()
--
--# copy .svg files into build directory for shadow builds
--file(GLOB DESKTOP_FILES *.svg)
--
--foreach(DESKTOP_FILE ${DESKTOP_FILES})
--    file(COPY "${DESKTOP_FILE}"
--        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
--        )
--endforeach()
++# copy sample application files into build directory for shadow builds
++file(COPY applications
++     DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
++    )
 === added directory 'tests/plugins/Unity/Launcher/applications'
 === renamed file 'tests/plugins/Unity/Launcher/abs-icon.desktop' => 'tests/plugins/Unity/Launcher/applications/abs-icon.desktop'
 --- tests/plugins/Unity/Launcher/abs-icon.desktop	2013-08-20 17:57:08 +0000
 +++ tests/plugins/Unity/Launcher/applications/abs-icon.desktop	2016-09-28 15:23:28 +0000
@@ -1,3 +1,4 @@
  [Desktop Entry]
++Type=Application
  Name=Absolute Icon
  Icon=/path/to/icon.png
 === renamed file 'tests/plugins/Unity/Launcher/click-icon.desktop' => 'tests/plugins/Unity/Launcher/applications/click-icon.desktop'
 --- tests/plugins/Unity/Launcher/click-icon.desktop	2013-09-09 16:30:56 +0000
 +++ tests/plugins/Unity/Launcher/applications/click-icon.desktop	2016-09-28 15:23:28 +0000
@@ -1,4 +1,5 @@
  [Desktop Entry]
++Type=Application
  Name=Click Package Icon
  Icon=click-icon.svg
  Path=/path/to/some/click/app
 === renamed file 'tests/plugins/Unity/Launcher/click-icon.svg' => 'tests/plugins/Unity/Launcher/applications/click-icon.svg'
 === renamed file 'tests/plugins/Unity/Launcher/no-name.desktop' => 'tests/plugins/Unity/Launcher/applications/no-name.desktop'
 --- tests/plugins/Unity/Launcher/no-name.desktop	2013-08-20 17:57:08 +0000
 +++ tests/plugins/Unity/Launcher/applications/no-name.desktop	2016-09-28 15:23:28 +0000
@@ -1,2 +1,3 @@
  [Desktop Entry]
++Type=Application
  Icon=no-name
 === renamed file 'tests/plugins/Unity/Launcher/rel-icon.desktop' => 'tests/plugins/Unity/Launcher/applications/rel-icon.desktop'
 --- tests/plugins/Unity/Launcher/rel-icon.desktop	2013-09-09 16:30:56 +0000
 +++ tests/plugins/Unity/Launcher/applications/rel-icon.desktop	2016-09-28 15:23:28 +0000
@@ -1,3 +1,4 @@
  [Desktop Entry]
++Type=Application
  Name=Relative Icon
  Icon=rel-icon.svg
 === renamed file 'tests/plugins/Unity/Launcher/rel-icon.svg' => 'tests/plugins/Unity/Launcher/applications/rel-icon.svg'
 === modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
 --- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-07-25 14:57:11 +0000
 +++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-09-28 15:23:28 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013-2015 Canonical Ltd.
++ * Copyright 2013-2016 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
@@ -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>
   */
  // unity-api
@@ -177,7 +174,7 @@
          appManager->addApplication(new MockApp("abs-icon"));
          QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);
--        appManager->addApplication(new MockApp("no-icon"));
++        appManager->addApplication(new MockApp("rel-icon"));
          QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);
          launcherModel->m_settings->setStoredApplications(QStringList());
@@ -199,6 +196,10 @@
                                                                QString::fromUtf8(g_get_user_name()));
          QVERIFY(removeReply.isValid());
          QCOMPARE(removeReply.value(), true);
++
++        // Some tests move the directory, so lets move it back if so.
++        // But this will usually fail.
++        QFile::rename("applications.old", "applications");
+     }
      void testMove() {
@@ -331,7 +332,7 @@
      void testApplicationRunning() {
          launcherModel->pin("abs-icon");
--        launcherModel->pin("no-icon");
++        launcherModel->pin("rel-icon");
          QCOMPARE(launcherModel->get(0)->running(), true);
          QCOMPARE(launcherModel->get(1)->running(), true);
@@ -340,7 +341,7 @@
          QCOMPARE(launcherModel->get(0)->running(), false);
          QCOMPARE(launcherModel->get(1)->running(), true);
--        appManager->stopApplication("no-icon");
++        appManager->stopApplication("rel-icon");
          QCOMPARE(launcherModel->get(0)->running(), false);
          QCOMPARE(launcherModel->get(1)->running(), false);
+     }
@@ -355,7 +356,7 @@
          QCOMPARE(launcherModel->get(0)->focused(), true);
          QCOMPARE(launcherModel->get(1)->focused(), false);
--        appManager->focusApplication("no-icon");
++        appManager->focusApplication("rel-icon");
          QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);
          QCOMPARE(launcherModel->get(0)->focused(), false);
          QCOMPARE(launcherModel->get(1)->focused(), true);
@@ -377,8 +378,8 @@
          QCOMPARE(launcherModel->rowCount(), 2);
          // stop the second one keeping it pinned so that it doesn't go away
--        launcherModel->pin("no-icon");
--        appManager->stopApplication("no-icon");
++        launcherModel->pin("rel-icon");
++        appManager->stopApplication("rel-icon");
          // find the first Quit item, should be there
          QuickListModel *model = qobject_cast<QuickListModel*>(launcherModel->get(0)->quickList());
@@ -407,7 +408,7 @@
          // first app should be gone...
          QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);
          // ... the second app (now at index 0) should still be there, pinned and stopped
--        QCOMPARE(launcherModel->get(0)->appId(), QStringLiteral("no-icon"));
++        QCOMPARE(launcherModel->get(0)->appId(), QStringLiteral("rel-icon"));
          QCOMPARE(launcherModel->get(0)->pinned(), true);
          QCOMPARE(launcherModel->get(0)->running(), false);
+     }
@@ -602,17 +603,16 @@
          // pin both apps
          launcherModel->pin("abs-icon");
--        launcherModel->pin("no-icon");
++        launcherModel->pin("rel-icon");
          // close both apps
          appManager->removeApplication(0);
          appManager->removeApplication(0);
          // "delete" the .desktop files
--        QString oldCurrent = QDir::currentPath();
          if (deleted) {
              // In testing mode, the launcher searches the current dir for the sample .desktop file
--            // We can make that fail by changing the current dir
--            QDir::setCurrent("..");
++            // We can make that fail by moving the applications dir
++            QFile::rename("applications", "applications.old");
+         }
          // Call refresh
@@ -623,9 +623,6 @@
          QCOMPARE(reply.isValid(), true);
          QCOMPARE(launcherModel->rowCount(), deleted ? 0 : 2);
--
--        // Restoring current dir
--        QDir::setCurrent(oldCurrent);
+     }
      void testSettings() {
@@ -637,7 +634,7 @@
          // pin both apps
          launcherModel->pin("abs-icon");
--        launcherModel->pin("no-icon");
++        launcherModel->pin("rel-icon");
          QCOMPARE(spy.count(), 0);
          // Now settings should have 2 apps
@@ -659,9 +656,9 @@
          QCOMPARE(launcherModel->rowCount(), 1);
          // Add them back but in reverse order
--        settings->simulateDConfChanged(QStringList() << "no-icon" << "abs-icon");
++        settings->simulateDConfChanged(QStringList() << "rel-icon" << "abs-icon");
          QCOMPARE(launcherModel->rowCount(), 2);
--        QCOMPARE(launcherModel->get(0)->appId(), QString("no-icon"));
++        QCOMPARE(launcherModel->get(0)->appId(), QString("rel-icon"));
          QCOMPARE(launcherModel->get(1)->appId(), QString("abs-icon"));
          QCOMPARE(spy.count(), 2);
+     }
@@ -671,7 +668,7 @@
          QCOMPARE(launcherModel->rowCount(), getASConfig().count());
          int oldCount = launcherModel->rowCount();
--        appManager->addApplication(new MockApp("rel-icon"));
++        appManager->addApplication(new MockApp("click-icon"));
          QCOMPARE(launcherModel->rowCount(), oldCount + 1);
          QCOMPARE(launcherModel->rowCount(), getASConfig().count());
+     }
 === removed file 'tests/plugins/Unity/Launcher/no-icon.desktop'
 --- tests/plugins/Unity/Launcher/no-icon.desktop	2013-08-20 17:57:08 +0000
 +++ tests/plugins/Unity/Launcher/no-icon.desktop	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
--[Desktop Entry]
--Name=No Icon