on xenial help sign in
load name and icon from desktop file if possible
commitf4d6113b7b07e9c4724277901ac5262c65a1864d authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 22 Aug 2014, 13:56 (12 years ago) parent36ba1aa
1 file changed+9−5
plugins/Unity/Launcher/backend/launcherbackend.cpp+9−5
plugins/Unity/Launcher/backend/launcherbackend.cpp+9−5
@@ -413,7 +413,8 @@ void LauncherBackend::loadFromVariant(const QVariantMap &details)
413413 }
414414 QString appId = details.value("id").toString();
415415
416− if (findDesktopFile(appId).isEmpty()) {
416+ QString desktopFile = findDesktopFile(appId);
417+ if (desktopFile.isEmpty()) {
417418 return;
418419 }
419420
@@ -422,10 +423,13 @@ void LauncherBackend::loadFromVariant(const QVariantMap &details)
422423 delete item;
423424 }
424425
425− item = new LauncherBackendItem();
426−
427− item->displayName = details.value("name").toString();
428− item->icon = details.value("icon").toString();
426+ if (qgetenv("USER") == "lightdm") {
427+ item = new LauncherBackendItem();
428+ item->displayName = details.value("name").toString();
429+ item->icon = details.value("icon").toString();
430+ } else {
431+ item = parseDesktopFile(desktopFile);
432+ }
429433 item->count = details.value("count").toInt();
430434 item->countVisible = details.value("countVisible").toBool();
431435