f4d6113 · unity8 · git.iko.soy

on xenial help sign in

load name and icon from desktop file if possible

f4d6113Michael Zanetti12 years ago

plugins/Unity/Launcher/backend/launcherbackend.cpp+9−5

@@ -413,7 +413,8 @@ void LauncherBackend::loadFromVariant(const QVariantMap &details)

413 }

414 QString appId = details.value("id").toString();

415

416− if (findDesktopFile(appId).isEmpty()) {

416+ QString desktopFile = findDesktopFile(appId);

417+ if (desktopFile.isEmpty()) {

417 return;

418 return;

418 }

419 }

419

420

@@ -422,10 +423,13 @@ void LauncherBackend::loadFromVariant(const QVariantMap &details)

422 delete item;

423 delete item;

423 }

424 }

424

425

426+ if (qgetenv("USER") == "lightdm") {

425− item = new LauncherBackendItem();

427+ item = new LauncherBackendItem();

426−

427− item->displayName = details.value("name").toString();

428+ item->displayName = details.value("name").toString();

428− item->icon = details.value("icon").toString();

429+ item->icon = details.value("icon").toString();

430+ } else {

431+ item = parseDesktopFile(desktopFile);

432+ }

429 item->count = details.value("count").toInt();

433 item->count = details.value("count").toInt();

430 item->countVisible = details.value("countVisible").toBool();

434 item->countVisible = details.value("countVisible").toBool();

431

435