git.iko.soy/unity8
on xenial help sign in
don't load unity7 favorites but only work with the new items key
18fc462Michael Zanetti
plugins/Unity/Launcher/gsettings.cpp+1−8
compare with xenial
unifiedsplit
@@ -34,14 +34,7 @@ QStringList GSettings::storedApplications() const
34
34
35 QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
35 QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
36
36
37− QString settingsKey = "items";
38−
39− // If "items" doesn't contain anything yet, import unity7's "favorites"
40− if (gSettings.get(settingsKey).toStringList().isEmpty()) {
41− settingsKey = "favorites";
42− }
43−
44− Q_FOREACH(const QString &entry, gSettings.get(settingsKey).toStringList()) {
37+ Q_FOREACH(const QString &entry, gSettings.get("items").toStringList()) {
45 if (entry.startsWith("application://")) {
38 if (entry.startsWith("application://")) {
46 // convert legacy entries to new world appids
39 // convert legacy entries to new world appids
47 QString appId = entry;
40 QString appId = entry;