Merge lp:~mzanetti/unity8/launcher-defaults-from-dconf into lp:unity8

[Michael Zanetti]

load launcher default config from existing dconf key

To clear your accountsservice settings (restore the default) call:

gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Set com.canonical.unity.AccountsService launcher-items "<[{'defaults' : <true>}]>"

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/unity8-ci/847/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2862
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/451
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/848
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/848/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2868
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2868/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/453
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/453/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/413

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

I'm always upset a bit by stuff like

+ if (m_itemCache.contains(appId)) {
+ return m_itemCache.value(appId)->desktopFile;
+ }

Since we end up seraching appId twice in the hash. Maybe you can use something like

auto lala = m_itemCache.value(appId);
if (lala) return lala->desktopFile;
..do rest of stuf..

Also, the setStoredApplications code is filling the cache with LauncherBackendItem for the new appIds but just empty, what's the reasoning behind that? Shouldn't that be a nullptr so the code above works?

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> I'm always upset a bit by stuff like
>
> + if (m_itemCache.contains(appId)) {
> + return m_itemCache.value(appId)->desktopFile;
> + }
>
> Since we end up seraching appId twice in the hash. Maybe you can use something
> like
>
> auto lala = m_itemCache.value(appId);
> if (lala) return lala->desktopFile;
> ..do rest of stuf..

Given that m_itemCache is a QHash I don't think its much of a problem. It's not that we would need to iterate twice over the whole list. But sure, some small tuning can be done...

> Also, the setStoredApplications code is filling the cache with
> LauncherBackendItem for the new appIds but just empty, what's the reasoning
> behind that? Shouldn't that be a nullptr so the code above works?

Ouch... That happens when there is a weekend between writing the code and updating the tests... Will fix.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/unity8-ci/853/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2877
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/461
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/854
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/854/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/853
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2883
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2883/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/463
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/463/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/423

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/unity8-ci/857/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2890
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/471
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/858
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/858/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/857
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2896
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2896/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/473
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/473/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/431

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

the default configuration landed on the current image

[Gerry Boland (gerboland)]

Works, and code fine. Approving

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/347/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1968
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/509
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/346
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/346/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2948
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2948/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/511
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/511/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/465

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-08-21 21:33:59 +0000
+++ debian/control	2013-09-02 15:18:56 +0000
@@ -9,6 +9,7 @@
                libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
                libgl1-mesa-dri,
                libgles2-mesa-dev[armhf],
+               libgsettings-qt-dev,
                libhud-client2-dev,
                libjson-perl,
                libnih-dbus-dev,

=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
--- plugins/Unity/Launcher/CMakeLists.txt	2013-08-19 01:35:45 +0000
+++ plugins/Unity/Launcher/CMakeLists.txt	2013-09-02 15:18:56 +0000
@@ -1,11 +1,13 @@
 include(FindPkgConfig)
 pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)
+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 
 add_definitions(-DSM_BUSNAME=systemBus)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/AccountsService
+    ${GSETTINGS_QT_INCLUDE_DIRS}
 )
 
 set(QMLLAUNCHERPLUGIN_SRC
@@ -25,6 +27,8 @@
     ${QMLLAUNCHERPLUGIN_SRC}
     )
 
+target_link_libraries(UnityLauncher-qml ${GSETTINGS_QT_LDFLAGS})
+
 qt5_use_modules(UnityLauncher-qml DBus Qml)
 
 # export the qmldir and qmltypes files

=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
--- plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-08-29 13:56:15 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-09-02 15:18:56 +0000
@@ -24,6 +24,18 @@
 #include <QDir>
 #include <QDBusArgument>
 #include <QFileInfo>
+#include <QGSettings>
+
+class LauncherBackendItem
+{
+public:
+    LauncherBackendItem(): pinned(false) {}
+
+    QString desktopFile;
+    QString displayName;
+    QString icon;
+    bool pinned;
+};
 
 LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):
     QObject(parent),
@@ -32,95 +44,109 @@
     if (useStorage) {
         m_accounts = new AccountsService(this);
     }
-    setUser(qgetenv("USER"));
+    m_user = qgetenv("USER");
+    syncFromAccounts();
 }
 
 LauncherBackend::~LauncherBackend()
 {
-    clearItems();
-}
+    m_storedApps.clear();
 
-void LauncherBackend::clearItems()
-{
-    for (LauncherBackendItem &app: m_storedApps) {
-        delete app.settings;
+    Q_FOREACH(LauncherBackendItem *item, m_itemCache) {
+        delete item;
     }
-    m_storedApps.clear();
+    m_itemCache.clear();
 }
 
 QStringList LauncherBackend::storedApplications() const
 {
-    auto files = QStringList();
-    for (const LauncherBackendItem &app: m_storedApps) {
-        files << app.settings->fileName();
-    }
-    return files;
+    return m_storedApps;
 }
 
 void LauncherBackend::setStoredApplications(const QStringList &appIds)
 {
-    // Record all existing pinned apps, so we can notice them in new list
-    auto pinnedItems = QStringList();
-    for (LauncherBackendItem &app: m_storedApps) {
-        if (app.pinned) {
-            pinnedItems.append(app.settings->fileName());
+    if (appIds.count() < m_storedApps.count()) {
+        Q_FOREACH(const QString &appId, m_storedApps) {
+            if (!appIds.contains(appId)) {
+                delete m_itemCache.take(appId);
+            }
         }
     }
-
-    clearItems();
-
-    for (const QString &appId: appIds) {
-        loadApp(makeAppDetails(appId, pinnedItems.contains(desktopFile(appId))));
-    }
-
+    m_storedApps = appIds;
     syncToAccounts();
 }
 
 QString LauncherBackend::desktopFile(const QString &appId) const
 {
-    QFileInfo fileInfo(QDir("/usr/share/applications"), appId);
-    return fileInfo.absoluteFilePath();
+    LauncherBackendItem *item = m_itemCache.value(appId);
+    if (item) {
+        return item->desktopFile;
+    }
+
+    return findDesktopFile(appId);
 }
 
 QString LauncherBackend::displayName(const QString &appId) const
 {
-    auto desktopFile = parseDesktopFile(appId);
-    auto displayName = desktopFile->value("Desktop Entry/Name").toString();
-    delete desktopFile;
-    return displayName;
+    LauncherBackendItem *item = m_itemCache.value(appId);
+    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
 {
-    auto desktopFile = parseDesktopFile(appId);
-    auto iconName = desktopFile->value("Desktop Entry/Icon").toString();
-    delete desktopFile;
-
-    if (!iconName.isEmpty()) {
-        QFileInfo iconFileInfo(iconName);
-        if (iconFileInfo.isRelative()) {
-            iconName = "image://gicon/" + iconName;
+    QString iconName;
+    LauncherBackendItem *item = m_itemCache.value(appId);
+    if (item) {
+        iconName = item->icon;
+    } else {
+        QString df = findDesktopFile(appId);
+        if (!df.isEmpty()) {
+            LauncherBackendItem *item = parseDesktopFile(df);
+            m_itemCache.insert(appId, item);
+            iconName = item->icon;
         }
     }
 
-    return iconName;
+    QFileInfo info(iconName);
+    if (info.exists()) {
+        return info.absoluteFilePath();
+    }
+    return "image://theme/" + iconName;
 }
 
 bool LauncherBackend::isPinned(const QString &appId) const
 {
-    auto index = findItem(appId);
-    if (index < 0) {
-        return false;
-    } else {
-        return m_storedApps[index].pinned;
+    LauncherBackendItem *item = m_itemCache.value(appId);
+    if (item) {
+        return item->pinned;
     }
+    return false;
 }
 
 void LauncherBackend::setPinned(const QString &appId, bool pinned)
 {
-    auto index = findItem(appId);
-    if (index >= 0 && !m_storedApps[index].pinned) {
-        m_storedApps[index].pinned = pinned;
+    if (!m_storedApps.contains(appId)) {
+        return;
+    }
+
+    LauncherBackendItem *item = m_itemCache.value(appId);
+    if (!item) {
+        item = new LauncherBackendItem();
+        m_itemCache.insert(appId, item);
+    }
+    if (item->pinned != pinned) {
+        item->pinned = pinned;
         syncToAccounts();
     }
 }
@@ -153,8 +179,10 @@
 
 void LauncherBackend::setUser(const QString &username)
 {
-    m_user = username;
-    syncFromAccounts();
+    if (qgetenv("USER") == "lightdm" && m_user != username) {
+        m_user = username;
+        syncFromAccounts();
+    }
 }
 
 void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)
@@ -169,75 +197,118 @@
     QList<QVariantMap> apps;
     bool defaults = true;
 
-    clearItems();
+    m_storedApps.clear();
 
-    if (m_user != "" && m_accounts != nullptr) {
-        auto variant = m_accounts->getUserProperty(m_user, "launcher-items");
+    if (m_accounts && m_user.isEmpty()) {
+        QVariant variant = m_accounts->getUserProperty(m_user, "launcher-items");
         apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
         defaults = isDefaultsItem(apps);
     }
 
-    // TODO: load default pinned ones from default config, instead of hardcoding here...
-    if (defaults) {
-        apps <<
-            makeAppDetails("dialer-app.desktop", true) <<
-            makeAppDetails("messaging-app.desktop", true) <<
-            makeAppDetails("address-book-app.desktop", true) <<
-            makeAppDetails("camera-app.desktop", true) <<
-            makeAppDetails("gallery-app.desktop", true) <<
-            makeAppDetails("facebook-webapp.desktop", true) <<
-            makeAppDetails("webbrowser-app.desktop", true) <<
-            makeAppDetails("twitter-webapp.desktop", true) <<
-            makeAppDetails("gmail-webapp.desktop", true) <<
-            makeAppDetails("ubuntu-weather-app.desktop", true) <<
-            makeAppDetails("notes-app.desktop", true) <<
-            makeAppDetails("calendar-app.desktop", true);
-    }
-
-    for (const QVariant &app: apps) {
-        loadApp(app.toMap());
+    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;
+                appId.remove("application://");
+                QString df = findDesktopFile(appId);
+
+                if (!df.isEmpty()) {
+                    m_storedApps << appId;
+
+                    if (!m_itemCache.contains(appId)) {
+                        m_itemCache.insert(appId, parseDesktopFile(df));
+                    }
+                    m_itemCache.value(appId)->pinned = true;
+                }
+            }
+        }
+    } else {
+        for (const QVariant &app: apps) {
+            loadFromVariant(app.toMap());
+        }
     }
 }
 
 void LauncherBackend::syncToAccounts()
 {
-    if (m_user != "" && m_accounts != nullptr) {
+    if (m_accounts && !m_user.isEmpty()) {
         QList<QVariantMap> items;
 
-        for (LauncherBackendItem &app: m_storedApps) {
-            items << makeAppDetails(app.settings->fileName(), app.pinned);
+        Q_FOREACH(const QString &appId, m_storedApps) {
+            items << itemToVariant(appId);
         }
 
         m_accounts->setUserProperty(m_user, "launcher-items", QVariant::fromValue(items));
     }
 }
 
-QSettings *LauncherBackend::parseDesktopFile(const QString &appId) const
-{
-    auto fullAppId = desktopFile(appId);
-    return new QSettings(fullAppId, QSettings::IniFormat);
-}
-
-void LauncherBackend::loadApp(const QVariantMap &details)
-{
-    auto appId = details.value("id").toString();
-    auto isPinned = details.value("is-pinned").toBool();
-
-    if (appId.isEmpty()) {
+QString LauncherBackend::findDesktopFile(const QString &appId) const
+{
+    int dashPos = -1;
+    QString helper = appId;
+
+    do {
+        if (dashPos != -1) {
+            helper = helper.replace(dashPos, 1, '/');
+        }
+
+        QFileInfo fileInfo(QDir("/usr/share/applications"), helper);
+        if (fileInfo.exists()) {
+            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->desktopFile = desktopFile;
+    item->displayName = settings.value("Desktop Entry/Name").toString();
+    item->icon = settings.value("Desktop Entry/Icon").toString();
+    item->pinned = false;
+    return item;
+}
+
+void LauncherBackend::loadFromVariant(const QVariantMap &details)
+{
+    if (!details.contains("id")) {
         return;
     }
-
-    LauncherBackendItem item;
-    item.settings = parseDesktopFile(appId);
-    item.pinned = isPinned;
-    m_storedApps.append(item);
+    QString appId = details.value("id").toString();
+
+    LauncherBackendItem *item = m_itemCache.value(appId);
+    if (item) {
+        delete item;
+    }
+
+    item = new LauncherBackendItem();
+
+    item->desktopFile = details.value("desktopFile").toString();
+    item->displayName = details.value("name").toString();
+    item->icon = details.value("icon").toString();
+    item->pinned = details.value("is-pinned").toBool();
+
+    m_itemCache.insert(appId, item);
+    m_storedApps.append(appId);
 }
 
-QVariantMap LauncherBackend::makeAppDetails(const QString &appId, bool pinned) const
+QVariantMap LauncherBackend::itemToVariant(const QString &appId) const
 {
+    LauncherBackendItem *item = m_itemCache.value(appId);
     QVariantMap details;
     details.insert("id", appId);
-    details.insert("is-pinned", pinned);
+    details.insert("name", item->displayName);
+    details.insert("icon", item->icon);
+    details.insert("desktopFile", item->desktopFile);
+    details.insert("is-pinned", item->pinned);
     return details;
 }
 
@@ -248,14 +319,3 @@
     // list of one item with the 'defaults' field set to true.
     return (apps.size() == 1 && apps[0].value("defaults").toBool());
 }
-
-int LauncherBackend::findItem(const QString &appId) const
-{
-    auto fullAppId = desktopFile(appId);
-    for (int i = 0; i < m_storedApps.size(); ++i) {
-        if (m_storedApps[i].settings->fileName() == fullAppId) {
-            return i;
-        }
-    }
-    return -1;
-}

=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.h'
--- plugins/Unity/Launcher/backend/launcherbackend.h	2013-08-23 19:49:18 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.h	2013-09-02 15:18:56 +0000
@@ -31,6 +31,8 @@
   * @brief An interface that provides all the data needed by the launcher.
   */
 
+class LauncherBackendItem;
+
 class LauncherBackend : public QObject
 {
     Q_OBJECT
@@ -141,23 +143,19 @@
     void countChanged(const QString &appId, int count);
 
 private:
-    QSettings *parseDesktopFile(const QString &appId) const;
-    QVariantMap makeAppDetails(const QString &appId, bool pinned) const;
-    void loadApp(const QVariantMap &details);
-    int findItem(const QString &appId) const;
+    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();
-    void clearItems();
-
-    class LauncherBackendItem
-    {
-    public:
-        QSettings *settings;
-        bool pinned;
-    };
-
-    QList<LauncherBackendItem> m_storedApps;
+
+    QList<QString> m_storedApps;
+    mutable QHash<QString, LauncherBackendItem*> m_itemCache;
+
     AccountsService *m_accounts;
     QString m_user;
 };

=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
--- tests/plugins/Unity/Launcher/CMakeLists.txt	2013-08-20 17:57:08 +0000
+++ tests/plugins/Unity/Launcher/CMakeLists.txt	2013-09-02 15:18:56 +0000
@@ -1,8 +1,11 @@
+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
+
 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}
     )
 
 add_definitions(-DSM_BUSNAME=sessionBus)
@@ -19,4 +22,5 @@
     ${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)

=== modified file 'tests/plugins/Unity/Launcher/launcherbackendtest.cpp'
--- tests/plugins/Unity/Launcher/launcherbackendtest.cpp	2013-08-22 21:56:18 +0000
+++ tests/plugins/Unity/Launcher/launcherbackendtest.cpp	2013-09-02 15:18:56 +0000
@@ -32,46 +32,13 @@
         LauncherBackend backend(false);
 
         backend.setStoredApplications(QStringList() << "relative.path" << "/full/path");
-        QCOMPARE(backend.storedApplications(), QStringList() << "/usr/share/applications/relative.path" << "/full/path");
-
-        QCOMPARE(backend.desktopFile("one.desktop"), QString("/usr/share/applications/one.desktop"));
-        QCOMPARE(backend.desktopFile("two"), QString("/usr/share/applications/two"));
-        QCOMPARE(backend.desktopFile("/full"), QString("/full"));
-
-        QCOMPARE(backend.desktopFile("/usr/share/applications/one.desktop"), QString("/usr/share/applications/one.desktop"));
-    }
-
-    void testDesktopReading()
-    {
-        LauncherBackend backend(false);
-
-        QCOMPARE(backend.displayName(SRCDIR "/rel-icon.desktop"), QString("Relative Icon"));
-        QCOMPARE(backend.icon(SRCDIR "/rel-icon.desktop"), QString("image://gicon/rel-icon"));
-
-        QCOMPARE(backend.displayName(SRCDIR "/abs-icon.desktop"), QString("Absolute Icon"));
-        QCOMPARE(backend.icon(SRCDIR "/abs-icon.desktop"), QString("/path/to/icon.png"));
-
-        QCOMPARE(backend.displayName(SRCDIR "/no-icon.desktop"), QString("No Icon"));
-        QCOMPARE(backend.icon(SRCDIR "/no-icon.desktop"), QString(""));
-
-        QCOMPARE(backend.displayName(SRCDIR "/no-name.desktop"), QString(""));
-        QCOMPARE(backend.icon(SRCDIR "/no-name.desktop"), QString("image://gicon/no-name"));
-
-        QCOMPARE(backend.displayName(SRCDIR "/no-exist.desktop"), QString(""));
-        QCOMPARE(backend.icon(SRCDIR "/no-exist.desktop"), QString(""));
+        QCOMPARE(backend.storedApplications(), QStringList() << "relative.path" << "/full/path");
     }
 
     void testPinning()
     {
         LauncherBackend backend(false);
 
-        // Confirm that default entries are all pinned
-        auto defaultApps = backend.storedApplications();
-        QVERIFY(defaultApps.size() > 0);
-        for (auto app: defaultApps) {
-            QCOMPARE(backend.isPinned(app), true);
-        }
-
         backend.setStoredApplications(QStringList() << "one" << "two");
         QCOMPARE(backend.isPinned("one"), false);
         QCOMPARE(backend.isPinned("two"), false);