git.iko.soy/unity8
on xenial help sign in
unhardcode launcherbackend's search paths for .dekstop files
552d304Michael Zanetti
plugins/Unity/Launcher/backend/launcherbackend.cpp+2−4
compare with xenial
unifiedsplit
@@ -26,6 +26,7 @@
26#include <QFileInfo>
26#include <QFileInfo>
27#include <QGSettings>
27#include <QGSettings>
28#include <QDebug>
28#include <QDebug>
29+#include <QStandardPaths>
29
30
30class LauncherBackendItem
31class LauncherBackendItem
31{
32{
@@ -232,10 +233,7 @@ QString LauncherBackend::findDesktopFile(const QString &appId) const
232 int dashPos = -1;
233 int dashPos = -1;
233 QString helper = appId;
234 QString helper = appId;
234
235
235− QStringList searchDirs;
236+ QStringList searchDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
236− searchDirs << QDir::homePath() + "/.local/share/applications";
237− searchDirs << "/usr/share/applications";
238−
239#ifdef LAUNCHER_TESTING
237#ifdef LAUNCHER_TESTING
240 searchDirs << "";
238 searchDirs << "";
241#endif
239#endif