Merge lp:~mzanetti/unity8/rework-launcher-backend into lp:unity8

[Michael Zanetti]

Rework LauncherBackend

* This splits the LauncherBackend class into 3 separate classes: DBusInterface, GSettings and DesktopFileHandler in order to reduce complexity
* Fixes all currently known backend related bugs
* Moves storage from AccountService to DConf (drops AS support for now)

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

https://code.launchpad.net/~mzanetti/unity-api/launcher-v4/+merge/232198
https://code.launchpad.net/~mzanetti/unity/new-key-in-launcher-schema/+merge/232199

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

yes (in phone-right-edge ppa)

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

no

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

no

[lp:~mzanetti/unity8/rework-launcher-backend]

1206. By Michael Zanetti on 2014-08-29

drop some debug prints

1207. By Michael Zanetti on 2014-08-29

drop more debug prints

1208. By Michael Zanetti on 2014-08-29

and one more debug print dropped

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1205
http://jenkins.qa.ubuntu.com/job/unity8-ci/4179/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4243/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1273/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1273/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5495/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1208
http://jenkins.qa.ubuntu.com/job/unity8-ci/4183/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4252/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1184/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1277/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1277/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5504/console

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/rework-launcher-backend]

1209. By Michael Zanetti on 2014-09-01

merge prereq also adding support for in desktop file translations

1210. By Michael Zanetti on 2014-09-02

ooops. this shouldn't have gone in

1211. By Michael Zanetti on 2014-09-02

also revert the other workarounds for being able to work

1212. By Michael Zanetti on 2014-09-02

make DesktopFileHander static to save some memory

1213. By Michael Zanetti on 2014-09-02

make it a namespace only

1214. By Michael Zanetti on 2014-09-02

drop unneeded debug print and microoptimize an if/else

1215. By Michael Zanetti on 2014-09-02

change DesktopFileHandler back into a stateful class but more polished

1216. By Michael Zanetti on 2014-09-02

require 7.90 of libunuty-api

1217. By Michael Zanetti on 2014-09-02

properly mark overrides

1218. By Michael Zanetti on 2014-09-03

fix dependency on unity-schemas

1219. By Michael Zanetti on 2014-09-03

bump launcher-impl version requirement

1220. By Michael Zanetti on 2014-09-03

improve countEmblem test and fix some warnings along the way

1221. By Michael Zanetti on 2014-09-03

make some count emblems visible in the mock

1222. By Michael Zanetti on 2014-09-09

don't load unity7 favorites but only work with the new items key

1223. By Michael Zanetti on 2014-09-10

merge trunk

1224. By Michael Zanetti on 2014-09-18

fix dependency on unity-schemas

1225. By Michael Zanetti on 2014-09-18

fix schema to reflect change in unity-schemas

Unmerged revisions

=== added file 'data/unity8-filewatcher.conf'
--- data/unity8-filewatcher.conf	1970-01-01 00:00:00 +0000
+++ data/unity8-filewatcher.conf	2014-09-01 17:50:27 +0000
@@ -0,0 +1,8 @@
+description "File system watcher for unity8"
+author "Michael Zanetti <[e-mail]>"
+
+# Workaround for bug 1360208. ~ and * in one expression doesn't work currently
+start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)
+
+exec dbus-send --type=method_call --dest=com.canonical.Unity.Launcher /com/canonical/Unity/Launcher com.canonical.Unity.Launcher.Refresh
+
 
=== modified file 'debian/unity8.install'
--- debian/unity8.install	2014-08-27 07:57:54 +0000
+++ debian/unity8.install	2014-09-01 17:50:27 +0000
@@ -1,5 +1,6 @@
 data/unity8.conf usr/share/upstart/sessions/
 data/unity8-dash.conf usr/share/upstart/sessions/
+data/unity8-filewatcher.conf usr/share/upstart/sessions/
 usr/bin/unity8
 usr/bin/unity8-dash
 usr/share/applications/unity8.desktop
 
=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
--- plugins/Unity/Launcher/CMakeLists.txt	2014-08-18 12:45:32 +0000
+++ plugins/Unity/Launcher/CMakeLists.txt	2014-09-01 17:50:27 +0000
@@ -1,5 +1,5 @@
 include(FindPkgConfig)
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 
@@ -16,8 +16,10 @@
     launchermodel.cpp
     launcheritem.cpp
     quicklistmodel.cpp
-    common/quicklistentry.cpp
-    backend/launcherbackend.cpp
+    quicklistentry.cpp
+    dbusinterface.cpp
+    gsettings.cpp
+    desktopfilehandler.cpp
     ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
 
=== removed directory 'plugins/Unity/Launcher/backend'
=== removed file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
--- plugins/Unity/Launcher/backend/launcherbackend.cpp	2014-06-11 15:36:51 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp	1970-01-01 00:00:00 +0000
@@ -1,584 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Michael Terry <[e-mail]>
- *  Michael Zanetti <[e-mail]>
- *
- * 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.
- *
- * 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "AccountsServiceDBusAdaptor.h"
-#include "launcherbackend.h"
-
-#include <QDir>
-#include <QDBusArgument>
-#include <QFileInfo>
-#include <QGSettings>
-#include <QDebug>
-#include <QStandardPaths>
-
-class LauncherBackendItem
-{
-public:
-    QString displayName;
-    QString icon;
-    int     count;
-    bool    countVisible;
-};
-
-LauncherBackend::LauncherBackend(QObject *parent):
-    QDBusVirtualObject(parent),
-    m_accounts(nullptr)
-{
-#ifndef LAUNCHER_TESTING
-    m_accounts = new AccountsServiceDBusAdaptor(this);
-#endif
-    m_user = qgetenv("USER");
-    syncFromAccounts();
-
-    /* Set up ourselves on DBus */
-    QDBusConnection con = QDBusConnection::sessionBus();
-    if (!con.registerService("com.canonical.Unity.Launcher")) {
-        qDebug() << "Unable to register launcher name";
-    }
-    if (!con.registerVirtualObject("/com/canonical/Unity/Launcher", this, QDBusConnection::VirtualObjectRegisterOption::SubPath)) {
-        qDebug() << "Unable to register launcher object";
-    }
-}
-
-LauncherBackend::~LauncherBackend()
-{
-    /* Remove oursevles from DBus */
-    QDBusConnection con = QDBusConnection::sessionBus();
-    con.unregisterService("com.canonical.Unity.Launcher");
-    con.unregisterObject("/com/canonical/Unity/Launcher");
-
-    /* Clear data */
-    m_storedApps.clear();
-
-    Q_FOREACH(LauncherBackendItem *item, m_itemCache) {
-        delete item;
-    }
-    m_itemCache.clear();
-}
-
-QStringList LauncherBackend::storedApplications() const
-{
-    return m_storedApps;
-}
-
-void LauncherBackend::setStoredApplications(const QStringList &appIds)
-{
-    if (appIds.count() < m_storedApps.count()) {
-        Q_FOREACH(const QString &appId, m_storedApps) {
-            if (!appIds.contains(appId)) {
-                delete m_itemCache.take(appId);
-            }
-        }
-    }
-    m_storedApps = appIds;
-    Q_FOREACH(const QString &appId, appIds) {
-        if (!m_itemCache.contains(appId)) {
-            QString df = findDesktopFile(appId);
-            if (!df.isEmpty()) {
-                LauncherBackendItem *item = parseDesktopFile(df);
-                m_itemCache.insert(appId, item);
-            } else {
-                // Cannot find any data for that app... ignoring it.
-                qWarning() << "cannot find desktop file for" << appId << ". discarding app.";
-                m_storedApps.removeAll(appId);
-            }
-        }
-    }
-    syncToAccounts();
-}
-
-QString LauncherBackend::desktopFile(const QString &appId) const
-{
-    return findDesktopFile(appId);
-}
-
-QString LauncherBackend::displayName(const QString &appId) const
-{
-    LauncherBackendItem *item = m_itemCache.value(appId, nullptr);
-    if (item) {
-        return item->displayName;
-    }
-
-    QString df = findDesktopFile(appId);
-    if (!df.isEmpty()) {
-        LauncherBackendItem *item = parseDesktopFile(df);
-        m_itemCache.insert(appId, item);
-        return item->displayName;
-    }
-
-    return QString();
-}
-
-QString LauncherBackend::icon(const QString &appId) const
-{
-    QString iconName;
-    LauncherBackendItem *item = getItem(appId);
-    if (item) {
-        iconName = item->icon;
-    }
-
-    return iconName;
-}
-
-QList<QuickListEntry> LauncherBackend::quickList(const QString &appId) const
-{
-    // TODO: Get static (from .desktop file) and dynamic (from the app itself)
-    // entries and return them here. Frontend related entries (like "Pin to launcher")
-    // don't matter here. This is just the backend part.
-    // TODO: emit quickListChanged() when the dynamic part changes
-    Q_UNUSED(appId)
-    return QList<QuickListEntry>();
-}
-
-int LauncherBackend::progress(const QString &appId) const
-{
-    // TODO: Return value for progress emblem.
-    // TODO: emit progressChanged() when this value changes.
-    Q_UNUSED(appId)
-    return -1;
-}
-
-int LauncherBackend::count(const QString &appId) const
-{
-    int count = -1;
-    LauncherBackendItem *item = getItem(appId);
-
-    if (item) {
-        if (item->countVisible) {
-            count = item->count;
-        }
-    }
-
-    return count;
-}
-
-void LauncherBackend::setCount(const QString &appId, int count) const
-{
-    LauncherBackendItem *item = getItem(appId);
-
-    bool emitchange = false;
-    if (item) {
-        emitchange = (item->count != count);
-        item->count = count;
-    }
-
-    if (emitchange) {
-        /* TODO: This needs to use the accessor to handle the visibility
-           correctly, but when we have the two properties we can just use
-           the local value */
-        Q_EMIT countChanged(appId, this->count(appId));
-        QVariant vcount(item->count);
-        emitPropChangedDbus(appId, "count", vcount);
-    }
-}
-
-bool LauncherBackend::countVisible(const QString &appId) const
-{
-    bool visible = false;
-    LauncherBackendItem *item = getItem(appId);
-
-    if (item) {
-        visible = item->countVisible;
-    }
-
-    return visible;
-}
-
-void LauncherBackend::setCountVisible(const QString &appId, bool visible) const
-{
-    LauncherBackendItem *item = getItem(appId);
-
-    bool emitchange = false;
-    if (item) {
-        emitchange = (item->countVisible != visible);
-        item->countVisible = visible;
-    } else {
-        qDebug() << "Unable to find:" << appId;
-    }
-
-    if (emitchange) {
-        /* TODO: Because we're using visible in determining the
-           count we need to emit a count changed as well */
-        Q_EMIT countChanged(appId, this->count(appId));
-        Q_EMIT countVisibleChanged(appId, item->countVisible);
-        QVariant vCountVisible(item->countVisible);
-        emitPropChangedDbus(appId, "countVisible", vCountVisible);
-    }
-}
-
-void LauncherBackend::setUser(const QString &username)
-{
-    if (qgetenv("USER") == "lightdm" && m_user != username) {
-        m_user = username;
-        syncFromAccounts();
-    }
-}
-
-void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)
-{
-    // TODO: execute the given quicklist action
-    Q_UNUSED(appId)
-    Q_UNUSED(quickListId)
-}
-
-void LauncherBackend::syncFromAccounts()
-{
-    QList<QVariantMap> apps;
-    bool defaults = true;
-
-    m_storedApps.clear();
-
-    if (m_accounts && !m_user.isEmpty()) {
-        QVariant variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");
-        if (variant.isValid() && variant.canConvert<QDBusArgument>()) {
-            apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
-            defaults = isDefaultsItem(apps);
-        }
-    }
-
-    if (m_accounts && defaults) { // Checking accounts as it'll be null when !useStorage
-        QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
-        Q_FOREACH(const QString &entry, gSettings.get("favorites").toStringList()) {
-            if (entry.startsWith("application://")) {
-                QString appId = entry;
-                // Transform "application://foobar.desktop" to "application://foobar"
-                appId.remove("application://");
-                if (appId.endsWith(".desktop")) {
-                    appId.chop(8);
-                }
-                QString df = findDesktopFile(appId);
-
-                if (!df.isEmpty()) {
-                    m_storedApps << appId;
-
-                    if (!m_itemCache.contains(appId)) {
-                        m_itemCache.insert(appId, parseDesktopFile(df));
-                    }
-                }
-            }
-            if (entry.startsWith("appid://")) {
-                QString appId = entry;
-                appId.remove("appid://");
-                // Strip hook name and current-user-version in case its there
-
-                if (appId.split('/').count() != 3) {
-                    qWarning() << "ignoring entry " + appId + ". Not a valid appId.";
-                    continue;
-                }
-                appId = appId.split('/').first() +  "_" + appId.split('/').at(1);
-                QString df = findDesktopFile(appId);
-
-                if (!df.isEmpty()) {
-                    m_storedApps << appId;
-
-                    if (!m_itemCache.contains(appId)) {
-                        m_itemCache.insert(appId, parseDesktopFile(df));
-                    }
-                }
-            }
-        }
-    } else {
-        for (const QVariant &app: apps) {
-            loadFromVariant(app.toMap());
-        }
-    }
-}
-
-void LauncherBackend::syncToAccounts()
-{
-    if (m_accounts && !m_user.isEmpty()) {
-        QList<QVariantMap> items;
-
-        Q_FOREACH(const QString &appId, m_storedApps) {
-            items << itemToVariant(appId);
-        }
-
-        m_accounts->setUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items", QVariant::fromValue(items));
-    }
-}
-
-QString LauncherBackend::findDesktopFile(const QString &appId) const
-{
-    int dashPos = -1;
-    QString helper = appId;
-
-    QStringList searchDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-#ifdef LAUNCHER_TESTING
-    searchDirs << "";
-#endif
-
-    do {
-        if (dashPos != -1) {
-            helper = helper.replace(dashPos, 1, '/');
-        }
-
-        Q_FOREACH(const QString &searchDirName, searchDirs) {
-            QDir searchDir(searchDirName);
-            Q_FOREACH(const QString &desktopFile, searchDir.entryList(QStringList() << "*.desktop")) {
-                if (desktopFile.startsWith(helper)) {
-                    QFileInfo fileInfo(searchDir, desktopFile);
-                    return fileInfo.absoluteFilePath();
-                }
-            }
-        }
-
-        dashPos = helper.indexOf("-");
-    } while (dashPos != -1);
-
-    return QString();
-}
-
-LauncherBackendItem* LauncherBackend::parseDesktopFile(const QString &desktopFile) const
-{
-    QSettings settings(desktopFile, QSettings::IniFormat);
-
-    LauncherBackendItem* item = new LauncherBackendItem();
-    item->displayName = settings.value("Desktop Entry/Name").toString();
-
-    QString iconString = settings.value("Desktop Entry/Icon").toString();
-    QString pathString = settings.value("Desktop Entry/Path").toString();
-    if (QFileInfo(iconString).exists()) {
-        item->icon = QFileInfo(iconString).absoluteFilePath();
-    } else if (QFileInfo(pathString + '/' + iconString).exists()) {
-        item->icon = pathString + '/' + iconString;
-    } else {
-        item->icon =  "image://theme/" + iconString;
-    }
-
-    /* TODO: These should be looked up in a cache somewhere */
-    item->count = 0;
-    item->countVisible = false;
-
-    return item;
-}
-
-/* Gets an item, and tries to create a new one if we need it to */
-LauncherBackendItem* LauncherBackend::getItem(const QString &appId) const
-{
-    LauncherBackendItem *item = m_itemCache.value(appId, nullptr);
-    if (!item) {
-        QString df = findDesktopFile(appId);
-        if (!df.isEmpty()) {
-            item = parseDesktopFile(df);
-            if (item) {
-                m_itemCache[appId] = item;
-            } else {
-                qWarning() << "Unable to parse desktop file for" << appId << "path" << df;
-            }
-        } else {
-            qWarning() << "Unable to find desktop file for:" << appId;
-        }
-    }
-
-    if (!item)
-        qWarning() << "Unable to find item for: " << appId;
-
-    return item;
-}
-
-void LauncherBackend::loadFromVariant(const QVariantMap &details)
-{
-    if (!details.contains("id")) {
-        return;
-    }
-    QString appId = details.value("id").toString();
-
-    LauncherBackendItem *item = m_itemCache.value(appId, nullptr);
-    if (item) {
-        delete item;
-    }
-
-    item = new LauncherBackendItem();
-
-    item->displayName = details.value("name").toString();
-    item->icon = details.value("icon").toString();
-    item->count = details.value("count").toInt();
-    item->countVisible = details.value("countVisible").toBool();
-
-    m_itemCache.insert(appId, item);
-    m_storedApps.append(appId);
-}
-
-QVariantMap LauncherBackend::itemToVariant(const QString &appId) const
-{
-    LauncherBackendItem *item = m_itemCache.value(appId);
-    QVariantMap details;
-    details.insert("id", appId);
-    details.insert("name", item->displayName);
-    details.insert("icon", item->icon);
-    details.insert("count", item->count);
-    details.insert("countVisible", item->countVisible);
-    return details;
-}
-
-bool LauncherBackend::isDefaultsItem(const QList<QVariantMap> &apps) const
-{
-    // To differentiate between an empty list and a list that hasn't been set
-    // yet (and should thus be populated with the defaults), we use a special
-    // list of one item with the 'defaults' field set to true.
-    return (apps.size() == 1 && apps[0].value("defaults").toBool());
-}
-
-bool LauncherBackend::handleMessage(const QDBusMessage& message, const QDBusConnection& connection)
-{
-    /* Check to make sure we're getting properties on our interface */
-    if (message.type() != QDBusMessage::MessageType::MethodCallMessage) {
-        return false;
-    }
-    if (message.interface() != "org.freedesktop.DBus.Properties") {
-        return false;
-    }
-    if (message.arguments()[0].toString() != "com.canonical.Unity.Launcher.Item") {
-        return false;
-    }
-
-    /* Break down the path to just the app id */
-    QString pathtemp = message.path();
-    if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {
-        return false;
-    }
-    pathtemp.remove("/com/canonical/Unity/Launcher/");
-    if (pathtemp.indexOf('/') >= 0) {
-        return false;
-    }
-
-    /* Find ourselves an appid */
-    QString appid = decodeAppId(pathtemp);
-    QVariantList retval;
-
-    if (message.member() == "Get") {
-        if (message.arguments()[1].toString() == "count") {
-            retval.append(QVariant::fromValue(QDBusVariant(this->count(appid))));
-        } else if (message.arguments()[1].toString() == "countVisible") {
-            retval.append(QVariant::fromValue(QDBusVariant(this->countVisible(appid))));
-        }
-    } else if (message.member() == "Set") {
-        if (message.arguments()[1].toString() == "count") {
-            this->setCount(appid, message.arguments()[2].value<QDBusVariant>().variant().toInt());
-        } else if (message.arguments()[1].toString() == "countVisible") {
-            this->setCountVisible(appid, message.arguments()[2].value<QDBusVariant>().variant().toBool());
-        }
-    } else if (message.member() == "GetAll") {
-        retval.append(this->itemToVariant(appid));
-    } else {
-        return false;
-    }
-
-    QDBusMessage reply = message.createReply(retval);
-    return connection.send(reply);
-}
-
-QString LauncherBackend::introspect(const QString &path) const
-{
-    /* This case we should just list the nodes */
-    if (path == "/com/canonical/Unity/Launcher/" || path == "/com/canonical/Unity/Launcher") {
-        QString nodes;
-
-        Q_FOREACH(const QString &appId, m_itemCache.keys()) {
-            nodes.append("<node name=\"");
-            nodes.append(encodeAppId(appId));
-            nodes.append("\"/>\n");
-        }
-
-        return nodes;
-    }
-
-    /* Should not happen, but let's handle it */
-    if (!path.startsWith("/com/canonical/Unity/Launcher")) {
-        return "";
-    }
-
-    /* Now we should be looking at a node */
-    QString nodeiface =
-        "<interface name=\"com.canonical.Unity.Launcher.Item\">"
-            "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
-            "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
-        "</interface>";
-    return nodeiface;
-}
-
-QString LauncherBackend::decodeAppId(const QString& path)
-{
-    QByteArray bytes = path.toUtf8();
-    QByteArray decoded;
-
-    for (int i = 0; i < bytes.size(); ++i) {
-        char chr = bytes.at(i);
-
-        if (chr == '_') {
-            QString number;
-            number.append(bytes.at(i+1));
-            number.append(bytes.at(i+2));
-
-            bool okay;
-            char newchar = number.toUInt(&okay, 16);
-            if (okay)
-                decoded.append(newchar);
-
-            i += 2;
-        } else {
-            decoded.append(chr);
-        }
-    }
-
-    return QString::fromUtf8(decoded);
-}
-
-QString LauncherBackend::encodeAppId(const QString& appId)
-{
-    QByteArray bytes = appId.toUtf8();
-    QString encoded;
-
-    for (int i = 0; i < bytes.size(); ++i) {
-        uchar chr = bytes.at(i);
-
-        if ((chr >= 'a' && chr <= 'z') ||
-            (chr >= 'A' && chr <= 'Z') ||
-            (chr >= '0' && chr <= '9'&& i != 0)) {
-            encoded.append(chr);
-        } else {
-            QString hexval = QString("_%1").arg(chr, 2, 16, QChar('0'));
-            encoded.append(hexval.toUpper());
-        }
-    }
-
-    return encoded;
-}
-
-void LauncherBackend::emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const
-{
-    QString path("/com/canonical/Unity/Launcher/");
-    path.append(encodeAppId(appId));
-
-    QDBusMessage message = QDBusMessage::createSignal(path, "org.freedesktop.DBus.Properties", "PropertiesChanged");
-
-    QList<QVariant> arguments;
-    QVariantHash changedprops;
-    changedprops[property] = QVariant::fromValue(QDBusVariant(value));
-    QVariantList deletedprops;
-
-    arguments.append(changedprops);
-    arguments.append(deletedprops);
-
-    message.setArguments(arguments);
-
-    QDBusConnection con = QDBusConnection::sessionBus();
-    con.send(message);
-}
 
=== removed file 'plugins/Unity/Launcher/backend/launcherbackend.h'
--- plugins/Unity/Launcher/backend/launcherbackend.h	2014-06-11 15:36:51 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.h	1970-01-01 00:00:00 +0000
@@ -1,196 +0,0 @@
-/* Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Michael Zanetti <[e-mail]>
- *
- * 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.
- *
- * 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef LAUNCHERBACKEND_H
-#define LAUNCHERBACKEND_H
-
-#include "common/quicklistentry.h"
-
-#include <QObject>
-#include <QSettings>
-#include <QStringList>
-#include <QDBusVirtualObject>
-
-class AccountsServiceDBusAdaptor;
-
-/**
-  * @brief An interface that provides all the data needed by the launcher.
-  */
-
-class LauncherBackendItem;
-class LauncherBackendTest;
-
-class LauncherBackend : public QDBusVirtualObject
-{
-    Q_OBJECT
-
-    friend LauncherBackendTest;
-
-public:
-    LauncherBackend(QObject *parent = 0);
-    virtual ~LauncherBackend();
-
-    /**
-      * @brief Returns a list of stored applications.
-      * @returns A list of application IDs.
-      */
-    QStringList storedApplications() const;
-
-    /**
-      * @brief Set the list of stored applications.
-      *
-      * Any previously stored information for apps not contained
-      * in the list any more, e.g. the pinned state, will be
-      * discarded.
-      *
-      * @param appIds The new list of stored applications.
-      */
-    void setStoredApplications(const QStringList &appIds);
-
-    /**
-      * @brief Get the full path to the .desktop file.
-      *
-      * The application does not need to be in the list of stored applications.
-      *
-      * @returns The full path to the .dekstop file.
-      */
-    QString desktopFile(const QString &appId) const;
-
-    /**
-      * @brief Get the user friendly name of an application.
-      *
-      * The application does not need to be in the list of stored applications.
-      *
-      * @param appId The ID of the application.
-      * @returns The user friendly name of the application.
-      */
-    QString displayName(const QString &appId) const;
-
-    /**
-      * @brief Get the icon of an application.
-      *
-      * The application does not need to be in the list of stored applications.
-      *
-      * @param appId The ID of the application.
-      * @returns The full path to the icon for the application.
-      */
-    QString icon(const QString &appId) const;
-
-    /**
-      * @brief Get the QuickList for an application.
-      * @param appId The ID of the application.
-      * @returns A QuickListModelInterface containing the QuickList.
-      */
-    QList<QuickListEntry> quickList(const QString &appId) const;
-
-    /**
-      * @brief Execute an action from the quickList
-      * @param appId The app ID for which the action was triggered
-      * @param the quicklist ID of the action that was triggered
-      */
-    void triggerQuickListAction(const QString &appId, const QString &entryId);
-
-    /**
-      * @brief Get the progress for the progress overlay of an application.
-      * @param appId The ID of the application.
-      * @returns The percentage of the overlay progress bar. -1 if no progress bar available.
-      */
-    int progress(const QString &appId) const;
-
-    /**
-      * @brief Get the count of the count overlay of an application.
-      * @param appId The ID of the application.
-      * @returns The number to be displayed in the overlay. -1 if no count overlay is available.
-      */
-    int count(const QString &appId) const;
-
-    /**
-      * @brief Set the count on an item
-      * @param appId The ID of the application
-      * @param count Count to show on the application
-      */
-    void setCount(const QString &appId, int count) const;
-
-    /**
-      * @brief Get whether the count should be visible
-      * @param appId The ID of the application.
-      * @returns Whether to show a count on the launcher
-      */
-    bool countVisible(const QString &appId) const;
-
-    /**
-      * @brief Set the visibility of the count item
-      * @param appId The ID of the application
-      * @param visible Whether the count should be visible
-      */
-    void setCountVisible(const QString &appId, bool visible) const;
-
-    /**
-      * @brief Sets the username for which to look up launcher items.
-      * @param username The username to use.
-      */
-    void setUser(const QString &username);
-
-    /**
-      * @brief Handle a message to an application node
-      * @param message DBus message to handle
-      * @param connection DBus connection that we're using
-      * @returns whether the message was handled
-      */
-    virtual bool handleMessage(const QDBusMessage& message, const QDBusConnection& connection);
-
-    /**
-      * @brief Get introspection information on the objects we're exporting
-      * @param path the dbus path containing the appid
-      * @returns Introspection information for that node in the tree
-      */
-    virtual QString introspect (const QString &path) const;
-
-Q_SIGNALS:
-    void quickListChanged(const QString &appId, const QList<QuickListEntry> &quickList) const;
-    void progressChanged(const QString &appId, int progress) const;
-    void countChanged(const QString &appId, int count) const;
-    void countVisibleChanged(const QString &appId, bool visible) const;
-
-private:
-    QString findDesktopFile(const QString &appId) const;
-    LauncherBackendItem* parseDesktopFile(const QString &desktopFile) const;
-
-    QVariantMap itemToVariant(const QString &appId) const;
-    void loadFromVariant(const QVariantMap &details);
-
-    bool isDefaultsItem(const QList<QVariantMap> &apps) const;
-    void syncFromAccounts();
-    void syncToAccounts();
-
-    QList<QString> m_storedApps;
-    mutable QHash<QString, LauncherBackendItem*> m_itemCache;
-
-    AccountsServiceDBusAdaptor *m_accounts;
-    QString m_user;
-
-    void emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const;
-
-protected: /* Protected to allow testing */
-    LauncherBackendItem* getItem(const QString& appId) const;
-
-    static QString decodeAppId(const QString& path);
-    static QString encodeAppId(const QString& appId);
-};
-
-#endif // LAUNCHERBACKEND_H
 
=== removed directory 'plugins/Unity/Launcher/common'
=== added file 'plugins/Unity/Launcher/dbusinterface.cpp'
--- plugins/Unity/Launcher/dbusinterface.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/dbusinterface.cpp	2014-09-01 17:50:27 +0000
@@ -0,0 +1,232 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#include "dbusinterface.h"
+#include "launchermodel.h"
+#include "launcheritem.h"
+
+#include <QDBusArgument>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDebug>
+
+DBusInterface::DBusInterface(LauncherModel *parent):
+    QDBusVirtualObject(parent),
+    m_launcherModel(parent)
+{
+    /* Set up ourselves on DBus */
+    QDBusConnection con = QDBusConnection::sessionBus();
+    if (!con.registerService("com.canonical.Unity.Launcher")) {
+        qWarning() << "Unable to register launcher name";
+    }
+    if (!con.registerVirtualObject("/com/canonical/Unity/Launcher", this, QDBusConnection::VirtualObjectRegisterOption::SubPath)) {
+        qWarning() << "Unable to register launcher object";
+    }
+}
+
+DBusInterface::~DBusInterface()
+{
+    /* Remove oursevles from DBus */
+    QDBusConnection con = QDBusConnection::sessionBus();
+    con.unregisterService("com.canonical.Unity.Launcher");
+    con.unregisterObject("/com/canonical/Unity/Launcher");
+}
+
+QString DBusInterface::introspect(const QString &path) const
+{
+    /* This case we should just list the nodes */
+    if (path == "/com/canonical/Unity/Launcher/" || path == "/com/canonical/Unity/Launcher") {
+        QString nodes;
+
+        // Add Refresh to introspect
+        nodes = "<interface name=\"com.canonical.Unity.Launcher\">"
+                "<method name=\"Refresh\"/>"
+                "</interface>";
+
+        // Add dynamic properties for launcher emblems
+        for (int i = 0; i < m_launcherModel->rowCount(); i++) {
+            nodes.append("<node name=\"");
+            nodes.append(encodeAppId(m_launcherModel->get(i)->appId()));
+            nodes.append("\"/>\n");
+        }
+        return nodes;
+    }
+
+    /* Should not happen, but let's handle it */
+    if (!path.startsWith("/com/canonical/Unity/Launcher")) {
+        return "";
+    }
+
+    /* Now we should be looking at a node */
+    QString nodeiface =
+        "<interface name=\"com.canonical.Unity.Launcher.Item\">"
+            "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
+            "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
+        "</interface>";
+    return nodeiface;
+}
+
+
+QString DBusInterface::decodeAppId(const QString& path)
+{
+    QByteArray bytes = path.toUtf8();
+    QByteArray decoded;
+
+    for (int i = 0; i < bytes.size(); ++i) {
+        char chr = bytes.at(i);
+
+        if (chr == '_') {
+            QString number;
+            number.append(bytes.at(i+1));
+            number.append(bytes.at(i+2));
+
+            bool okay;
+            char newchar = number.toUInt(&okay, 16);
+            if (okay)
+                decoded.append(newchar);
+
+            i += 2;
+        } else {
+            decoded.append(chr);
+        }
+    }
+
+    return QString::fromUtf8(decoded);
+}
+
+QString DBusInterface::encodeAppId(const QString& appId)
+{
+    QByteArray bytes = appId.toUtf8();
+    QString encoded;
+
+    for (int i = 0; i < bytes.size(); ++i) {
+        uchar chr = bytes.at(i);
+
+        if ((chr >= 'a' && chr <= 'z') ||
+            (chr >= 'A' && chr <= 'Z') ||
+            (chr >= '0' && chr <= '9'&& i != 0)) {
+            encoded.append(chr);
+        } else {
+            QString hexval = QString("_%1").arg(chr, 2, 16, QChar('0'));
+            encoded.append(hexval.toUpper());
+        }
+    }
+
+    return encoded;
+}
+
+bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnection& connection)
+{
+    /* Check to make sure we're getting properties on our interface */
+    if (message.type() != QDBusMessage::MessageType::MethodCallMessage) {
+        return false;
+    }
+
+    // First handle methods of the Launcher interface
+    if (message.interface() == "com.canonical.Unity.Launcher") {
+        if (message.member() == "Refresh") {
+            QDBusMessage reply = message.createReply();
+            Q_EMIT refreshCalled();
+            return connection.send(reply);
+        }
+    }
+
+    // Now handle dynamic properties (for launcher emblems)
+    if (message.interface() != "org.freedesktop.DBus.Properties") {
+        return false;
+    }
+
+    if (message.member() != "GetAll" && message.arguments()[0].toString() != "com.canonical.Unity.Launcher.Item") {
+        return false;
+    }
+
+    /* Break down the path to just the app id */
+    QString pathtemp = message.path();
+    if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {
+        return false;
+    }
+    pathtemp.remove("/com/canonical/Unity/Launcher/");
+    if (pathtemp.indexOf('/') >= 0) {
+        return false;
+    }
+
+    /* Find ourselves an appid */
+    QString appid = decodeAppId(pathtemp);
+    int index = m_launcherModel->findApplication(appid);
+    LauncherItem *item = static_cast<LauncherItem*>(m_launcherModel->get(index));
+
+    QVariantList retval;
+    if (message.member() == "Get") {
+        if (!item) {
+            return false;
+        }
+        if (message.arguments()[1].toString() == "count") {
+            retval.append(QVariant::fromValue(QDBusVariant(item->count())));
+        } else if (message.arguments()[1].toString() == "countVisible") {
+            retval.append(QVariant::fromValue(QDBusVariant(item->countVisible())));
+        }
+    } else if (message.member() == "Set") {
+        if (message.arguments()[1].toString() == "count") {
+            int newCount = message.arguments()[2].toInt();
+            if (!item || newCount != item->count()) {
+                Q_EMIT countChanged(appid, newCount);
+                emitPropChangedDbus(appid, "count", QVariant(newCount));
+            }
+        } else if (message.arguments()[1].toString() == "countVisible") {
+            bool newVisible = message.arguments()[2].toBool();
+            if (!item || newVisible != item->countVisible()) {
+                Q_EMIT countVisibleChanged(appid, newVisible);
+                emitPropChangedDbus(appid, "countVisible", newVisible);
+            }
+        }
+    } else if (message.member() == "GetAll") {
+        if (item) {
+            QVariantMap all;
+            all.insert("count", item->count());
+            all.insert("countVisible", item->countVisible());
+            retval.append(all);
+        }
+    } else {
+        return false;
+    }
+
+    QDBusMessage reply = message.createReply(retval);
+    return connection.send(reply);
+}
+
+void DBusInterface::emitPropChangedDbus(const QString& appId, const QString& property, const QVariant &value)
+{
+    QString path("/com/canonical/Unity/Launcher/");
+    path.append(encodeAppId(appId));
+
+    QDBusMessage message = QDBusMessage::createSignal(path, "org.freedesktop.DBus.Properties", "PropertiesChanged");
+
+    QList<QVariant> arguments;
+    QVariantHash changedprops;
+    changedprops[property] = QVariant::fromValue(QDBusVariant(value));
+    QVariantList deletedprops;
+
+    arguments.append(changedprops);
+    arguments.append(deletedprops);
+
+    message.setArguments(arguments);
+
+    QDBusConnection con = QDBusConnection::sessionBus();
+    con.send(message);
+}
 
=== added file 'plugins/Unity/Launcher/dbusinterface.h'
--- plugins/Unity/Launcher/dbusinterface.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/dbusinterface.h	2014-09-01 17:50:27 +0000
@@ -0,0 +1,50 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#include "launcheritem.h"
+
+#include <QDBusVirtualObject>
+
+class LauncherModel;
+
+class DBusInterface: public QDBusVirtualObject
+{
+    Q_OBJECT
+public:
+    DBusInterface(LauncherModel *parent);
+    ~DBusInterface();
+
+    // QDBusVirtualObject implementaition
+    QString introspect (const QString &path) const override;
+    bool handleMessage(const QDBusMessage& message, const QDBusConnection& connection) override;
+
+Q_SIGNALS:
+    void countChanged(const QString &appId, int count);
+    void countVisibleChanged(const QString &appId, bool countVisible);
+    void refreshCalled();
+
+private:
+    static QString decodeAppId(const QString& path);
+    static QString encodeAppId(const QString& appId);
+
+    void emitPropChangedDbus(const QString& appId, const QString& property, const QVariant &value);
+
+    LauncherModel *m_launcherModel;
+
+};
 
=== added file 'plugins/Unity/Launcher/desktopfilehandler.cpp'
--- plugins/Unity/Launcher/desktopfilehandler.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/desktopfilehandler.cpp	2014-09-01 17:50:27 +0000
@@ -0,0 +1,124 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#include "desktopfilehandler.h"
+
+#include <QStringList>
+#include <QStandardPaths>
+#include <QDir>
+#include <QSettings>
+#include <QLocale>
+
+#include <libintl.h>
+
+DesktopFileHandler::DesktopFileHandler(QObject *parent):
+    QObject(parent)
+{
+
+}
+
+QString DesktopFileHandler::findDesktopFile(const QString &appId) const
+{
+    int dashPos = -1;
+    QString helper = appId;
+
+    QStringList searchDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
+#ifdef LAUNCHER_TESTING
+    searchDirs << "";
+#endif
+
+    QString path;
+    do {
+        if (dashPos != -1) {
+            helper.replace(dashPos, 1, '/');
+        }
+
+        if (helper.contains("/")) {
+            path += helper.split('/').first() + '/';
+            helper.remove(QRegExp("^" + path));
+        }
+
+        Q_FOREACH(const QString &searchDirName, searchDirs) {
+            QDir searchDir(searchDirName + "/" + path);
+            Q_FOREACH(const QString &desktopFile, searchDir.entryList(QStringList() << "*.desktop")) {
+                if (desktopFile.startsWith(helper)) {
+                    QFileInfo fileInfo(searchDir, desktopFile);
+                    return fileInfo.absoluteFilePath();
+                }
+            }
+        }
+
+        dashPos = helper.indexOf("-");
+    } while (dashPos != -1);
+
+    return QString();
+}
+
+QString DesktopFileHandler::displayName(const QString &appId) const
+{
+    QString desktopFile = findDesktopFile(appId);
+    if (desktopFile.isEmpty()) {
+        return QString();
+    }
+
+    QSettings settings(desktopFile, QSettings::IniFormat);
+    settings.beginGroup("Desktop Entry");
+
+    // First try to find Name[xx_YY] and Name[xx] in .desktop file
+    QString locale = QLocale::system().name();
+    QString shortLocale = locale.split('_').first();
+
+    if (locale != shortLocale && settings.contains(QString("Name[%1]").arg(locale))) {
+        return settings.value(QString("Name[%1]").arg(locale)).toString();
+    }
+
+    if (settings.contains(QString("Name[%1]").arg(shortLocale))) {
+        return settings.value(QString("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("Name").toString();
+
+    if (settings.contains("X-Ubuntu-Gettext-Domain")) {
+        const QString domain = settings.value("X-Ubuntu-Gettext-Domain").toString();
+        return dgettext(domain.toUtf8().constData(), displayName.toUtf8().constData());
+    }
+
+    return displayName;
+}
+
+QString DesktopFileHandler::icon(const QString &appId) const
+{
+    QString desktopFile = findDesktopFile(appId);
+    if (desktopFile.isEmpty()) {
+        return QString();
+    }
+
+    QSettings settings(desktopFile, QSettings::IniFormat);
+    settings.beginGroup("Desktop Entry");
+    QString iconString = settings.value("Icon").toString();
+    QString pathString = settings.value("Path").toString();
+
+    if (QFileInfo(iconString).exists()) {
+        return QFileInfo(iconString).absoluteFilePath();
+    } else if (QFileInfo(pathString + '/' + iconString).exists()) {
+        return pathString + '/' + iconString;
+    }
+    return "image://theme/" + iconString;
+}
 
=== added file 'plugins/Unity/Launcher/desktopfilehandler.h'
--- plugins/Unity/Launcher/desktopfilehandler.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/desktopfilehandler.h	2014-09-01 17:50:27 +0000
@@ -0,0 +1,37 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#ifndef DESKTOPFILEHANDLER_H
+#define DESKTOPFILEHANDLER_H
+
+#include <QObject>
+
+class DesktopFileHandler: public QObject
+{
+    Q_OBJECT
+public:
+    DesktopFileHandler(QObject *parent = nullptr);
+
+    QString findDesktopFile(const QString &appId) const;
+
+    QString displayName(const QString &appId) const;
+    QString icon(const QString &appId) const;
+};
+
+#endif
 
=== added file 'plugins/Unity/Launcher/gsettings.cpp'
--- plugins/Unity/Launcher/gsettings.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/gsettings.cpp	2014-09-01 17:50:27 +0000
@@ -0,0 +1,76 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#include "gsettings.h"
+
+#include <QGSettings>
+#include <QVariant>
+#include <QDebug>
+
+GSettings::GSettings(QObject *parent):
+    QObject(parent)
+{
+
+}
+
+QStringList GSettings::storedApplications() const
+{
+    QStringList storedApps;
+
+    QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
+
+    QString settingsKey = "items";
+
+    // If "items" doesn't contain anything yet, import unity7's "favorites"
+    if (gSettings.get(settingsKey).toStringList().isEmpty()) {
+        settingsKey = "favorites";
+    }
+
+    Q_FOREACH(const QString &entry, gSettings.get(settingsKey).toStringList()) {
+        qDebug() << "got entry" << entry;
+        if (entry.startsWith("application://")) {
+            // convert legacy entries to new world appids
+            QString appId = entry;
+            // Transform "application://foobar.desktop" to "foobar"
+            appId.remove(QRegExp("^application://"));
+            appId.remove(QRegExp(".desktop$"));
+            storedApps << appId;
+        }
+        if (entry.startsWith("appid://")) {
+            QString appId = entry;
+            appId.remove("appid://");
+            if (appId.split('/').count() == 3) {
+                // Strip current-user-version in case its there
+                appId = appId.split('/').first() +  "_" + appId.split('/').at(1);
+            }
+            storedApps << appId;
+        }
+    }
+    return storedApps;
+}
+
+void GSettings::setStoredApplications(const QStringList &storedApplications)
+{
+    QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
+    QStringList gSettingsList;
+    Q_FOREACH(const QString &entry, storedApplications) {
+        gSettingsList << QString("appid://%1").arg(entry);
+    }
+    gSettings.set("items", gSettingsList);
+}
 
=== added file 'plugins/Unity/Launcher/gsettings.h'
--- plugins/Unity/Launcher/gsettings.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/gsettings.h	2014-09-01 17:50:27 +0000
@@ -0,0 +1,37 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#ifndef GSETTINGS_H
+#define GSETTINGS_H
+
+#include <QObject>
+#include <QStringList>
+
+
+class GSettings: public QObject
+{
+    Q_OBJECT
+public:
+    GSettings(QObject *parent = nullptr);
+
+    QStringList storedApplications() const;
+    void setStoredApplications(const QStringList &storedApplications);
+};
+
+#endif
 
=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
--- plugins/Unity/Launcher/launcheritem.cpp	2014-06-23 10:32:58 +0000
+++ plugins/Unity/Launcher/launcheritem.cpp	2014-09-01 17:50:27 +0000
@@ -32,6 +32,7 @@
     m_recent(false),
     m_progress(-1),
     m_count(0),
+    m_countVisible(false),
     m_focused(false),
     m_quickList(new QuickListModel(this))
 {
@@ -54,11 +55,27 @@
     return m_name;
 }
 
+void LauncherItem::setName(const QString &name)
+{
+    if (m_name != name) {
+        m_name = name;
+        Q_EMIT nameChanged(name);
+    }
+}
+
 QString LauncherItem::icon() const
 {
     return m_icon;
 }
 
+void LauncherItem::setIcon(const QString &icon)
+{
+    if (m_icon != icon) {
+        m_icon = icon;
+        Q_EMIT iconChanged(icon);
+    }
+}
+
 bool LauncherItem::pinned() const
 {
     return m_pinned;
@@ -128,6 +145,19 @@
     }
 }
 
+bool LauncherItem::countVisible() const
+{
+    return m_countVisible;
+}
+
+void LauncherItem::setCountVisible(bool countVisible)
+{
+    if (m_countVisible != countVisible) {
+        m_countVisible = countVisible;
+        Q_EMIT countVisibleChanged(countVisible);
+    }
+}
+
 bool LauncherItem::focused() const
 {
     return m_focused;
 
=== modified file 'plugins/Unity/Launcher/launcheritem.h'
--- plugins/Unity/Launcher/launcheritem.h	2014-06-11 15:36:51 +0000
+++ plugins/Unity/Launcher/launcheritem.h	2014-09-01 17:50:27 +0000
@@ -37,27 +37,27 @@
     QString appId() const;
     QString name() const;
     QString icon() const;
-
     bool pinned() const;
+    bool running() const;
+    bool recent() const;
+    int progress() const;
+    int count() const;
+    bool countVisible() const;
+    bool focused() const;
+
+    unity::shell::launcher::QuickListModelInterface *quickList() const;
+
+private:
+    void setName(const QString &name);
+    void setIcon(const QString &icon);
     void setPinned(bool pinned);
-
-    bool running() const;
     void setRunning(bool running);
-
-    bool recent() const;
     void setRecent(bool recent);
-
-    int progress() const;
     void setProgress(int progress);
-
-    int count() const;
     void setCount(int count);
-
-    bool focused() const;
+    void setCountVisible(bool countVisible);
     void setFocused(bool focused);
 
-    unity::shell::launcher::QuickListModelInterface *quickList() const;
-
 Q_SIGNALS:
     void favoriteChanged(bool favorite);
     void runningChanged(bool running);
@@ -71,8 +71,11 @@
     bool m_recent;
     int m_progress;
     int m_count;
+    bool m_countVisible;
     bool m_focused;
     QuickListModel *m_quickList;
+
+    friend class LauncherModel;
 };
 
 #endif // LAUNCHERITEM_H
 
=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2014-07-29 11:35:10 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2014-09-01 17:50:27 +0000
@@ -19,7 +19,9 @@
 
 #include "launchermodel.h"
 #include "launcheritem.h"
-#include "backend/launcherbackend.h"
+#include "gsettings.h"
+#include "desktopfilehandler.h"
+#include "dbusinterface.h"
 
 #include <unity/shell/application/ApplicationInfoInterface.h>
 
@@ -29,16 +31,24 @@
 
 LauncherModel::LauncherModel(QObject *parent):
     LauncherModelInterface(parent),
-    m_backend(new LauncherBackend(this)),
+    m_settings(new GSettings(this)),
+    m_dbusIface(new DBusInterface(this)),
+    m_desktopFileHandler(new DesktopFileHandler(this)),
     m_appManager(0)
 {
-    connect(m_backend, SIGNAL(countChanged(QString,int)), SLOT(countChanged(QString,int)));
-    connect(m_backend, SIGNAL(progressChanged(QString,int)), SLOT(progressChanged(QString,int)));
-
-    Q_FOREACH (const QString &entry, m_backend->storedApplications()) {
+    connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
+    connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
+    connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);
+
+    Q_FOREACH (const QString &entry, m_settings->storedApplications()) {
+        if (m_desktopFileHandler->findDesktopFile(entry).isEmpty()) {
+            qWarning() << "Couldn't find a .desktop file for" << entry << ". Skipping...";
+            continue;
+        }
+
         LauncherItem *item = new LauncherItem(entry,
-                                              m_backend->displayName(entry),
-                                              m_backend->icon(entry),
+                                              m_desktopFileHandler->displayName(entry),
+                                              m_desktopFileHandler->icon(entry),
                                               this);
         item->setPinned(true);
         m_list.append(item);
@@ -72,6 +82,8 @@
             return item->pinned();
         case RoleCount:
             return item->count();
+        case RoleCountVisible:
+            return item->countVisible();
         case RoleProgress:
             return item->progress();
         case RoleFocused:
@@ -138,10 +150,16 @@
         if (index == -1) {
             index = m_list.count();
         }
+
+        if (m_desktopFileHandler->findDesktopFile(appId).isEmpty()) {
+            qWarning() << "Can't pin this application, there is no .destkop file available.";
+            return;
+        }
+
         beginInsertRows(QModelIndex(), index, index);
         LauncherItem *item = new LauncherItem(appId,
-                                              m_backend->displayName(appId),
-                                              m_backend->icon(appId),
+                                              m_desktopFileHandler->displayName(appId),
+                                              m_desktopFileHandler->icon(appId),
                                               this);
         item->setPinned(true);
         m_list.insert(index, item);
@@ -194,25 +212,27 @@
 
         // Nope, we don't know this action, let the backend forward it to the application
         } else {
-            m_backend->triggerQuickListAction(appId, actionId);
+            // TODO: forward quicklist action to app, possibly via m_dbusIface
         }
     }
 }
 
 void LauncherModel::setUser(const QString &username)
 {
-    m_backend->setUser(username);
+    Q_UNUSED(username)
+    qWarning() << "This backend doesn't support multiple users";
 }
 
 QString LauncherModel::getUrlForAppId(const QString &appId) const
 {
     // appId is either an appId or a legacy app name.  Let's find out which
-    if (appId.isEmpty())
+    if (appId.isEmpty()) {
         return QString();
+    }
 
-    QString df = m_backend->desktopFile(appId + ".desktop");
-    if (!df.isEmpty())
+    if (!appId.contains("_")) {
         return "application:///" + appId + ".desktop";
+    }
 
     QStringList parts = appId.split('_');
     QString package = parts.value(0);
@@ -272,7 +292,7 @@
             appIds << item->appId();
         }
     }
-    m_backend->setStoredApplications(appIds);
+    m_settings->setStoredApplications(appIds);
 }
 
 int LauncherModel::findApplication(const QString &appId)
@@ -307,6 +327,53 @@
     }
 }
 
+void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)
+{
+    int idx = findApplication(appId);
+    if (idx >= 0) {
+        LauncherItem *item = m_list.at(idx);
+        item->setCountVisible(countVisible);
+        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCountVisible);
+
+        // If countVisible goes to false, and the item is neither pinned nor recent we can drop it
+        if (!countVisible && !item->pinned() && !item->recent()) {
+            beginRemoveRows(QModelIndex(), idx, idx);
+            m_list.takeAt(idx)->deleteLater();
+            endRemoveRows();
+        }
+    } else {
+        // Need to create a new LauncherItem and show the highlight
+        if (countVisible && !m_desktopFileHandler->findDesktopFile(appId).isEmpty()) {
+            LauncherItem *item = new LauncherItem(appId,
+                                                  m_desktopFileHandler->displayName(appId),
+                                                  m_desktopFileHandler->icon(appId));
+            item->setCountVisible(true);
+            beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
+            m_list.append(item);
+            endInsertRows();
+        }
+    }
+}
+
+void LauncherModel::refresh()
+{
+    QList<LauncherItem*> toBeRemoved;
+    Q_FOREACH (LauncherItem* item, m_list) {
+        if (m_desktopFileHandler->findDesktopFile(item->appId()).isEmpty()) {
+            toBeRemoved << item;
+        } else {
+            int idx = m_list.indexOf(item);
+            item->setName(m_desktopFileHandler->displayName(item->appId()));
+            item->setIcon(m_desktopFileHandler->icon(item->appId()));
+            Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
+        }
+    }
+
+    Q_FOREACH (LauncherItem* item, toBeRemoved) {
+        requestRemove(item->appId());
+    }
+}
+
 void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
 {
     Q_UNUSED(parent);
 
=== modified file 'plugins/Unity/Launcher/launchermodel.h'
--- plugins/Unity/Launcher/launchermodel.h	2014-06-11 15:36:51 +0000
+++ plugins/Unity/Launcher/launchermodel.h	2014-09-01 17:50:27 +0000
@@ -20,15 +20,15 @@
 #ifndef LAUNCHERMODEL_H
 #define LAUNCHERMODEL_H
 
-// unity-api
 #include <unity/shell/launcher/LauncherModelInterface.h>
 #include <unity/shell/application/ApplicationManagerInterface.h>
 
-// Qt
 #include <QAbstractListModel>
 
 class LauncherItem;
-class LauncherBackend;
+class GSettings;
+class DesktopFileHandler;
+class DBusInterface;
 
 using namespace unity::shell::launcher;
 using namespace unity::shell::application;
@@ -41,14 +41,13 @@
     LauncherModel(QObject *parent = 0);
     ~LauncherModel();
 
-    int rowCount(const QModelIndex &parent) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
 
     QVariant data(const QModelIndex &index, int role) const;
 
     Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const;
     Q_INVOKABLE void move(int oldIndex, int newIndex);
     Q_INVOKABLE void pin(const QString &appId, int index = -1);
-    Q_INVOKABLE void requestRemove(const QString &appId);
     Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
     Q_INVOKABLE void setUser(const QString &username);
     Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
@@ -56,13 +55,19 @@
     unity::shell::application::ApplicationManagerInterface* applicationManager() const;
     void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
 
+    int findApplication(const QString &appId);
+
+public Q_SLOTS:
+    void requestRemove(const QString &appId);
+
 private:
     void storeAppList();
-    int findApplication(const QString &appId);
 
 private Q_SLOTS:
+    void countChanged(const QString &appId, int count);
+    void countVisibleChanged(const QString &appId, int count);
     void progressChanged(const QString &appId, int progress);
-    void countChanged(const QString &appId, int count);
+    void refresh();
 
     void applicationAdded(const QModelIndex &parent, int row);
     void applicationRemoved(const QModelIndex &parent, int row);
@@ -70,7 +75,11 @@
 
 private:
     QList<LauncherItem*> m_list;
-    LauncherBackend *m_backend;
+
+    GSettings *m_settings;
+    DBusInterface *m_dbusIface;
+    DesktopFileHandler *m_desktopFileHandler;
+
     ApplicationManagerInterface *m_appManager;
 };
 
 
=== renamed file 'plugins/Unity/Launcher/common/quicklistentry.cpp' => 'plugins/Unity/Launcher/quicklistentry.cpp'
=== renamed file 'plugins/Unity/Launcher/common/quicklistentry.h' => 'plugins/Unity/Launcher/quicklistentry.h'
=== modified file 'plugins/Unity/Launcher/quicklistmodel.h'
--- plugins/Unity/Launcher/quicklistmodel.h	2013-07-24 10:42:00 +0000
+++ plugins/Unity/Launcher/quicklistmodel.h	2014-09-01 17:50:27 +0000
@@ -20,7 +20,7 @@
 #ifndef QUICKLISTMODEL_H
 #define QUICKLISTMODEL_H
 
-#include "common/quicklistentry.h"
+#include "quicklistentry.h"
 
 #include <unity/shell/launcher/QuickListModelInterface.h>
 
 
=== modified file 'qml/Dash/DashApplication.qml'
--- qml/Dash/DashApplication.qml	2014-08-07 15:29:12 +0000
+++ qml/Dash/DashApplication.qml	2014-09-01 17:50:27 +0000
@@ -24,12 +24,6 @@
 
     useDeprecatedToolbar: false
 
-    Binding {
-        target: i18n
-        property: "domain"
-        value: "unity8"
-    }
-
     Dash {
         anchors.fill: parent
     }
 
=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2014-08-11 15:54:10 +0000
+++ qml/Launcher/LauncherDelegate.qml	2014-09-01 17:50:27 +0000
@@ -21,7 +21,8 @@
     id: root
 
     property string iconName
-    property int count: -1
+    property int count: 0
+    property bool countVisible: false
     property int progress: -1
     property bool itemFocused: false
     property real maxAngle: 0
@@ -80,7 +81,7 @@
             width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
             height: units.gu(2)
             color: UbuntuColors.orange
-            visible: root.count > 0
+            visible: root.countVisible
             borderSource: "none"
 
             Label {
 
=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2014-08-12 16:21:21 +0000
+++ qml/Launcher/LauncherPanel.qml	2014-09-01 17:50:27 +0000
@@ -156,6 +156,7 @@
                         height: itemHeight
                         iconName: model.icon
                         count: model.count
+                        countVisible: model.countVisible
                         progress: model.progress
                         clipCorner: model.pinned
                         itemFocused: model.focused
 
=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2014-08-21 08:04:40 +0000
+++ qml/Notifications/Notification.qml	2014-09-01 17:50:27 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import QtMultimedia 5.0
+//import QtMultimedia 5.0
 import Ubuntu.Components 1.1
 import Unity.Notifications 1.0
 import QMenuModel 0.1
@@ -76,10 +76,10 @@
         return result;
     }
 
-    Audio {
+    Item {
         id: sound
         objectName: "sound"
-        source: hints["suppress-sound"] != "true" && hints["sound-file"] != undefined ? hints["sound-file"] : ""
+        //source: hints["suppress-sound"] != "true" && hints["sound-file"] != undefined ? hints["sound-file"] : ""
     }
 
     // FIXME: using onCompleted because of LP: #1354406 workaround, has to be onOpacityChanged really
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-08-28 20:06:18 +0000
+++ qml/Shell.qml	2014-09-01 17:50:27 +0000
@@ -592,12 +592,6 @@
         }
     }
 
-    Binding {
-        target: i18n
-        property: "domain"
-        value: "unity8"
-    }
-
     Dialogs {
         id: dialogs
         anchors.fill: parent
 
=== modified file 'run.sh'
--- run.sh	2014-07-28 12:56:55 +0000
+++ run.sh	2014-09-01 17:50:27 +0000
@@ -88,6 +88,7 @@
     echo "Unity8 is already running, please stop it first"
     exit 1
   fi
+  echo starting with $LD_LIBRARY_PATH
   /sbin/initctl start unity8 BINARY="`readlink -f $QML_PHONE_SHELL_PATH` $QML_PHONE_SHELL_ARGS $@" QML2_IMPORT_PATH=$QML2_IMPORT_PATH LD_LIBRARY_PATH=$LD_LIBRARY_PATH
   tailf -n 0 ~/.cache/upstart/unity8.log
 fi
 
=== modified file 'run_on_device.sh'
--- run_on_device.sh	2014-08-07 15:29:12 +0000
+++ run_on_device.sh	2014-09-01 17:50:27 +0000
@@ -7,7 +7,7 @@
 TARGET_IP=${TARGET_IP-127.0.0.1}
 TARGET_SSH_PORT=${TARGET_SSH_PORT-2222}
 TARGET_DEBUG_PORT=3768
-RUN_OPTIONS=-qmljsdebugger=port:$TARGET_DEBUG_PORT
+RUN_OPTIONS=#-qmljsdebugger=port:$TARGET_DEBUG_PORT
 SETUP=false
 GDB=false
 PINLOCK=false
 
=== modified file 'src/Dash/main.cpp'
--- src/Dash/main.cpp	2014-08-12 13:49:11 +0000
+++ src/Dash/main.cpp	2014-09-01 17:50:27 +0000
@@ -68,6 +68,7 @@
     }
 
     bindtextdomain("unity8", translationDirectory().toUtf8().data());
+    textdomain("unity8");
 
     QQuickView* view = new QQuickView();
     view->setResizeMode(QQuickView::SizeRootObjectToView);
 
=== modified file 'src/main.cpp'
--- src/main.cpp	2014-07-31 10:52:30 +0000
+++ src/main.cpp	2014-09-01 17:50:27 +0000
@@ -108,6 +108,7 @@
     }
 
     bindtextdomain("unity8", translationDirectory().toUtf8().data());
+    textdomain("unity8");
 
     QQuickView* view = new QQuickView();
     view->setResizeMode(QQuickView::SizeRootObjectToView);
 
=== modified file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
--- tests/mocks/Unity/Launcher/CMakeLists.txt	2014-06-17 18:23:44 +0000
+++ tests/mocks/Unity/Launcher/CMakeLists.txt	2014-09-01 17:50:27 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 
=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2014-06-17 18:23:44 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2014-09-01 17:50:27 +0000
@@ -131,6 +131,19 @@
     }
 }
 
+bool MockLauncherItem::countVisible() const
+{
+    return m_countVisible;
+}
+
+void MockLauncherItem::setCountVisible(bool countVisible)
+{
+    if (m_countVisible != countVisible) {
+        m_countVisible = countVisible;
+        Q_EMIT countVisibleChanged(countVisible);
+    }
+}
+
 bool MockLauncherItem::focused() const
 {
     return m_focused;
 
=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.h'
--- tests/mocks/Unity/Launcher/MockLauncherItem.h	2013-09-04 22:44:01 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.h	2014-09-01 17:50:27 +0000
@@ -52,6 +52,9 @@
     int count() const;
     void setCount(int count);
 
+    bool countVisible() const;
+    void setCountVisible(bool countVisible);
+
     bool focused() const;
     void setFocused(bool focused);
 
@@ -67,6 +70,7 @@
     bool m_recent;
     int m_progress;
     int m_count;
+    bool m_countVisible;
     bool m_focused;
     MockQuickListModel *m_quickList;
 };
 
=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
--- tests/plugins/Unity/Launcher/CMakeLists.txt	2014-08-18 12:45:32 +0000
+++ tests/plugins/Unity/Launcher/CMakeLists.txt	2014-09-01 17:50:27 +0000
@@ -1,12 +1,11 @@
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/AccountsService
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher
-    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend
     ${GSETTINGS_QT_INCLUDE_DIRS}
     )
 
@@ -14,35 +13,21 @@
 add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
 add_definitions(-DLAUNCHER_TESTING)
 
-### LauncherBackendTest
-set(testBackendCommand dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/launcherbackendtestExec
-      --parameter -o --parameter ${CMAKE_BINARY_DIR}/launcherbackendtest.xml,xunitxml
+### LauncherModelTest
+set(testModelCommand dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/launchermodeltestExec
+      --parameter -o --parameter ${CMAKE_BINARY_DIR}/launchermodeltest.xml,xunitxml
       --parameter -o --parameter -,txt)
-add_test(NAME launcherbackendtest COMMAND ${testBackendCommand})
-add_custom_target(launcherbackendtest ${testBackendCommand})
-add_executable(launcherbackendtestExec
-    launcherbackendtest.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp
-    )
-target_link_libraries(launcherbackendtestExec ${GSETTINGS_QT_LDFLAGS})
-qt5_use_modules(launcherbackendtestExec Test Core DBus)
-
-### LauncherModelTest
-set(testModelCommand ${CMAKE_CURRENT_BINARY_DIR}/launchermodeltestExec
-      -o ${CMAKE_BINARY_DIR}/launchermodeltest.xml,xunitxml
-      -o -,txt)
 add_test(NAME launchermodeltest COMMAND ${testModelCommand})
 add_custom_target(launchermodeltest ${testModelCommand})
 add_executable(launchermodeltestExec
     launchermodeltest.cpp
+    gsettings.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launchermodel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.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
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
@@ -50,7 +35,7 @@
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
     )
 target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS})
-qt5_use_modules(launchermodeltestExec Test Core DBus)
+qt5_use_modules(launchermodeltestExec Test Core DBus Xml)
 
 # copy .desktop files into build directory for shadow builds
 file(GLOB DESKTOP_FILES *.desktop)
 
=== added file 'tests/plugins/Unity/Launcher/gsettings.cpp'
--- tests/plugins/Unity/Launcher/gsettings.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Unity/Launcher/gsettings.cpp	2014-09-01 17:50:27 +0000
@@ -0,0 +1,40 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#include "gsettings.h"
+
+#include <QDebug>
+
+// This is a mock implementation to not touch GSettings for real during tests
+
+GSettings::GSettings(QObject *parent):
+    QObject(parent)
+{
+
+}
+
+QStringList GSettings::storedApplications() const
+{
+    return QStringList();
+}
+
+void GSettings::setStoredApplications(const QStringList &storedApplications)
+{
+    Q_UNUSED(storedApplications)
+}
 
=== added file 'tests/plugins/Unity/Launcher/gsettings.h'
--- tests/plugins/Unity/Launcher/gsettings.h	1970-01-01 00:00:00 +0000
+++ tests/plugins/Unity/Launcher/gsettings.h	2014-09-01 17:50:27 +0000
@@ -0,0 +1,38 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#ifndef GSETTINGS_H
+#define GSETTINGS_H
+
+#include <QObject>
+#include <QStringList>
+
+// This is a mock implementation to not touch GSettings for real during tests
+
+class GSettings: public QObject
+{
+    Q_OBJECT
+public:
+    GSettings(QObject *parent = nullptr);
+
+    QStringList storedApplications() const;
+    void setStoredApplications(const QStringList &storedApplications);
+};
+
+#endif
 
=== removed file 'tests/plugins/Unity/Launcher/launcherbackendtest.cpp'
--- tests/plugins/Unity/Launcher/launcherbackendtest.cpp	2014-04-29 14:19:41 +0000
+++ tests/plugins/Unity/Launcher/launcherbackendtest.cpp	1970-01-01 00:00:00 +0000
@@ -1,239 +0,0 @@
-/*
- * Copyright 2013 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 Terry <[e-mail]>
- */
-
-#include "launcherbackend.h"
-
-#include <QtTest>
-#include <QDBusConnection>
-#include <QDBusMessage>
-#include <QDBusVariant>
-
-
-class LauncherBackendTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-
-    void initTestCase()
-    {
-        // As we want to test absolute file paths in the .desktop file, we need to modify the
-        // sample file and replace the path in there with the current build dir.
-        QSettings settings(QDir::currentPath() + "/click-icon.desktop", QSettings::IniFormat);
-        settings.setValue("Desktop Entry/Path", QDir::currentPath());
-    }
-
-    void testFileNames()
-    {
-        LauncherBackend backend;
-
-        backend.setStoredApplications(QStringList() << "rel-icon" << "abs-icon" << "invalid");
-        QCOMPARE(backend.storedApplications(), QStringList() << "rel-icon" << "abs-icon");
-    }
-
-    void testIcon_data() {
-        QTest::addColumn<QString>("appId");
-        QTest::addColumn<QString>("expectedIcon");
-
-        // Needs to expand a relative icon to the absolute path
-        QTest::newRow("relative icon path") << "rel-icon" << QDir::currentPath() + "/rel-icon.svg";
-
-        // In case an icon is not found on disk, it needs to fallback on image://theme/ for it
-        QTest::newRow("fallback on theme") << "abs-icon" << "image://theme//path/to/icon.png";
-
-        // Click packages have a relative icon path but an absolute path as a separate entry
-        QTest::newRow("click package icon") << "click-icon" << QDir::currentPath() + "/click-icon.svg";
-    }
-
-    void testIcon() {
-        QFETCH(QString, appId);
-        QFETCH(QString, expectedIcon);
-
-        LauncherBackend backend;
-        backend.setStoredApplications(QStringList() << appId);
-
-        QCOMPARE(backend.icon(appId), expectedIcon);
-    }
-
-    void testGetItem_data() {
-        QTest::addColumn<QString>("appId");
-        QTest::addColumn<bool>("exists");
-
-        QTest::newRow("Exists") << "rel-icon" << true;
-        QTest::newRow("Doesn't Exist") << "does-not-exist" << false;
-    }
-
-    void testGetItem() {
-        QFETCH(QString, appId);
-        QFETCH(bool, exists);
-
-        LauncherBackend backend;
-        auto item = backend.getItem(appId);
-
-        if (exists) {
-            QVERIFY(item != nullptr);
-        } else {
-            QVERIFY(item == nullptr);
-        }
-    }
-
-    void testCount_data() {
-        QTest::addColumn<QString>("appId");
-        QTest::addColumn<bool>("setCount");
-        QTest::addColumn<int>("inCount");
-        QTest::addColumn<bool>("countVisible");
-        QTest::addColumn<int>("expectedCount");
-
-        /* Get baseline data on things working */
-        QTest::newRow("Baseline") << "rel-icon" << false << 0 << false << -1;
-
-        /* Valid count, but not visible */
-        QTest::newRow("Not visible") << "rel-icon" << true << 42 << false << -1;
-
-        /* Turn it on */
-        QTest::newRow("Visible Count") << "rel-icon" << true << 42 << true << 42;
-
-        /* Invalide app to load */
-        QTest::newRow("Invalid App ID") << "this-app-doesnt-exist" << true << 42 << true << -1;
-    }
-
-    void testCount() {
-        QFETCH(QString, appId);
-        QFETCH(bool, setCount);
-        QFETCH(int, inCount);
-        QFETCH(bool, countVisible);
-        QFETCH(int, expectedCount);
-
-        LauncherBackend backend;
-
-        if (setCount)
-            backend.setCount(appId, inCount);
-        backend.setCountVisible(appId, countVisible);
-
-        QCOMPARE(backend.count(appId), expectedCount);
-    }
-
-    void testDbusName_data() {
-        QTest::addColumn<QString>("decoded");
-        QTest::addColumn<QString>("encoded");
-
-        /* Passthrough test */
-        QTest::newRow("Passthrough") << "fine" << "fine";
-
-        /* Number as first characeter */
-        QTest::newRow("Number first") << "31337" << "_331337";
-
-        /* Underscore test */
-        QTest::newRow("Underscore test") << "this_is_c_style_namespacing" << "this_5Fis_5Fc_5Fstyle_5Fnamespacing";
-
-        /* Hyphen test */
-        QTest::newRow("Hyphen test") << "typical-application" << "typical_2Dapplication";
-
-        /* Japanese test */
-        QTest::newRow("日本語 test") << "日本語" << "_E6_97_A5_E6_9C_AC_E8_AA_9E";
-    }
-
-    void testDbusName() {
-        QFETCH(QString, decoded);
-        QFETCH(QString, encoded);
-
-        QString encodeOut = LauncherBackend::encodeAppId(decoded);
-        QCOMPARE(encoded, encodeOut);
-
-        QString decodeOut = LauncherBackend::decodeAppId(encoded);
-        QCOMPARE(decoded, decodeOut);
-    }
-
-    void testDbusIface_data() {
-        QTest::addColumn<QString>("appId");
-        QTest::addColumn<bool>("setCount");
-        QTest::addColumn<int>("inCount");
-        QTest::addColumn<bool>("countVisible");
-        QTest::addColumn<int>("expectedCount");
-
-        /* Get baseline data on things working */
-        QTest::newRow("Baseline") << "rel-icon" << false << 0 << false << -1;
-
-        /* Turn it on */
-        QTest::newRow("Visible Count") << "rel-icon" << true << 42 << true << 42;
-
-        /* Invalide app to load */
-        QTest::newRow("Invalid App ID") << "this-app-doesnt-exist" << true << 42 << true << -1;
-    }
-
-    void testDbusIface() {
-        QFETCH(QString, appId);
-        QFETCH(bool, setCount);
-        QFETCH(int, inCount);
-        QFETCH(bool, countVisible);
-        QFETCH(int, expectedCount);
-
-        QDBusConnection con = QDBusConnection::sessionBus();
-        QDBusMessage message;
-        QDBusMessage reply;
-
-        LauncherBackend backend;
-
-        if (setCount) {
-            message = QDBusMessage::createMethodCall("com.canonical.Unity.Launcher",
-                                                     "/com/canonical/Unity/Launcher/" + LauncherBackend::encodeAppId(appId),
-                                                     "org.freedesktop.DBus.Properties",
-                                                     "Set");
-            QVariantList cargs;
-            cargs.append(QString("com.canonical.Unity.Launcher.Item"));
-            cargs.append(QString("count"));
-            cargs.append(QVariant::fromValue(QDBusVariant(inCount)));
-
-            message.setArguments(cargs);
-            reply = con.call(message);
-            QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
-        }
-
-        /* Set countVisible */
-        message = QDBusMessage::createMethodCall("com.canonical.Unity.Launcher",
-                                                 "/com/canonical/Unity/Launcher/" + LauncherBackend::encodeAppId(appId),
-                                                 "org.freedesktop.DBus.Properties",
-                                                 "Set");
-        QVariantList cvargs;
-        cvargs.append(QString("com.canonical.Unity.Launcher.Item"));
-        cvargs.append(QString("countVisible"));
-        cvargs.append(QVariant::fromValue(QDBusVariant(countVisible)));
-
-        message.setArguments(cvargs);
-        reply = con.call(message);
-        QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
-
-        /* Get value */
-        message = QDBusMessage::createMethodCall("com.canonical.Unity.Launcher",
-                                                 "/com/canonical/Unity/Launcher/" + LauncherBackend::encodeAppId(appId),
-                                                 "org.freedesktop.DBus.Properties",
-                                                 "Get");
-        QVariantList getargs;
-        getargs.append(QString("com.canonical.Unity.Launcher.Item"));
-        getargs.append(QString("count"));
-
-        message.setArguments(getargs);
-        reply = con.call(message);
-        QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
-        QCOMPARE(reply.arguments()[0].value<QDBusVariant>().variant().toInt(), expectedCount);
-    }
-};
-
-QTEST_GUILESS_MAIN(LauncherBackendTest)
-#include "launcherbackendtest.moc"
 
=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-08-13 19:50:09 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-09-01 17:50:27 +0000
@@ -23,8 +23,12 @@
 
 #include "launcheritem.h"
 #include "launchermodel.h"
+#include "dbusinterface.h"
 
 #include <QtTest>
+#include <QDBusInterface>
+#include <QDBusReply>
+#include <QDomDocument>
 
 // This is a mock, specifically to test the LauncherModel
 class MockApp: public unity::shell::application::ApplicationInfoInterface
@@ -287,10 +291,86 @@
         QCOMPARE(launcherModel->getUrlForAppId(QString()), QString());
         QCOMPARE(launcherModel->getUrlForAppId(""), QString());
         QCOMPARE(launcherModel->getUrlForAppId("no-name"), QString("application:///no-name.desktop"));
-        QCOMPARE(launcherModel->getUrlForAppId("com.test.good"), QString("appid://com.test.good/first-listed-app/current-user-version"));
+        QCOMPARE(launcherModel->getUrlForAppId("com.test.good"), QString("application:///com.test.good.desktop"));
         QCOMPARE(launcherModel->getUrlForAppId("com.test.good_application"), QString("appid://com.test.good/application/current-user-version"));
         QCOMPARE(launcherModel->getUrlForAppId("com.test.good_application_1.2.3"), QString("appid://com.test.good/application/current-user-version"));
     }
+
+    void testIntrospection() {
+        QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher", "org.freedesktop.DBus.Introspectable");
+        QDBusReply<QString> reply = interface.call("Introspect");
+        QStringList nodes = extractNodes(reply.value());
+        QCOMPARE(nodes.count(), launcherModel->rowCount());
+
+        appManager->addApplication(new MockApp("foobar"));
+        reply = interface.call("Introspect");
+        nodes = extractNodes(reply.value());
+        QCOMPARE(nodes.contains("foobar"), true);
+
+        appManager->removeApplication(2);
+        reply = interface.call("Introspect");
+        nodes = extractNodes(reply.value());
+        QCOMPARE(nodes.contains("foobar"), false);
+    }
+
+    QStringList extractNodes(const QString &introspectionXml) {
+        QXmlStreamReader introspectReply(introspectionXml);
+
+        QStringList ret;
+        while (!introspectReply.atEnd() && !introspectReply.hasError()) {
+            QXmlStreamReader::TokenType token = introspectReply.readNext();
+
+            if (token == QXmlStreamReader::StartElement) {
+                if (introspectReply.name() == "node" && introspectReply.attributes().count() > 0) {
+                    ret  << introspectReply.attributes().value("name").toString();
+                }
+            }
+        }
+        return ret;
+    }
+
+    void testCountEmblems() {
+        // Call GetAll on abs-icon
+        QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "org.freedesktop.DBus.Properties");
+        QDBusReply<QVariantMap> reply = interface.call("GetAll");
+        QVariantMap map = reply.value();
+
+        // Make sure GetAll returns a map with count and countVisible props
+        QCOMPARE(map.contains("count"), true);
+        QCOMPARE(map.contains("countVisible"), true);
+
+        // Make sure count is intitilized to 0 and non-visible
+        QCOMPARE(map.value("count").toInt(), 0);
+        QCOMPARE(map.value("countVisible").toBool(), false);
+
+        // Now make it visible and set it to 55 through D-Bus
+        interface.call("Set", "com.canonical.Unity.Launcher.Item", "count", 55);
+        interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", true);
+
+        // Fetch it again using GetAll
+        reply = interface.call("GetAll");
+        map = reply.value();
+
+        // Make sure values have changed on the D-Bus interface
+        QCOMPARE(map.value("count").toInt(), 55);
+        QCOMPARE(map.value("countVisible").toBool(), true);
+
+        // Now the item on the upper side of the API
+        int index = launcherModel->findApplication("abs-icon");
+        QCOMPARE(index >= 0, true);
+
+        // And make sure values have changed there as well
+        QCOMPARE(launcherModel->get(index)->countVisible(), true);
+        QCOMPARE(launcherModel->get(index)->count(), 55);
+    }
+
+    void testRefresh() {
+        QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher", "com.canonical.Unity.Launcher");
+        QDBusReply<void> reply = interface.call("Refresh");
+
+        // Make sure the call to Refresh returned without error.
+        QCOMPARE(reply.isValid(), true);
+    }
 };
 
 QTEST_GUILESS_MAIN(LauncherModelTest)