git.iko.soy/unity8
on xenial help sign in
fix issues in ualwrapper
e842fecMichael Zanetti
plugins/Unity/Launcher/ualwrapper.cpp+7−2
compare with xenial
unifiedsplit
@@ -16,7 +16,11 @@ QStringList UalWrapper::installedApps()
16 QStringList appIds;
16 QStringList appIds;
17 try {
17 try {
18 for (const std::shared_ptr<Application> &app : Registry::installedApps()) {
18 for (const std::shared_ptr<Application> &app : Registry::installedApps()) {
19+ if (!QString::fromStdString(app->appId().package).isEmpty()) {
19− appIds << QString::fromStdString(app->appId().package) + QStringLiteral("_") + QString::fromStdString(app->appId().appname);
20+ appIds << QString::fromStdString(app->appId().package) + QStringLiteral("_") + QString::fromStdString(app->appId().appname);
21+ } else {
22+ appIds << QString::fromStdString(app->appId().appname);
23+ }
20 }
24 }
21 } catch(std::runtime_error &e) {
25 } catch(std::runtime_error &e) {
22 qWarning() << "ubuntu-all-launch threw an exception listing apps:" << e.what();
26 qWarning() << "ubuntu-all-launch threw an exception listing apps:" << e.what();
@@ -32,15 +36,16 @@ UalWrapper::AppInfo UalWrapper::getApplicationInfo(const QString &appId)
32 try {
36 try {
33 AppID ualAppId = AppID::find(appId.toStdString());
37 AppID ualAppId = AppID::find(appId.toStdString());
34 if (ualAppId.empty()) {
38 if (ualAppId.empty()) {
39+ qWarning() << "Empty ualAppId result for" << appId;
35 return info;
40 return info;
36 }
41 }
37
42
38 std::shared_ptr<Application> ualApp;
43 std::shared_ptr<Application> ualApp;
39 ualApp = Application::create(ualAppId, Registry::getDefault());
44 ualApp = Application::create(ualAppId, Registry::getDefault());
40
45
41− info.valid = true;
42 info.name = QString::fromStdString(ualApp->info()->name());
46 info.name = QString::fromStdString(ualApp->info()->name());
43 info.icon = QString::fromStdString(ualApp->info()->iconPath());
47 info.icon = QString::fromStdString(ualApp->info()->iconPath());
48+ info.valid = true;
44 } catch(std::runtime_error &e) {
49 } catch(std::runtime_error &e) {
45 qWarning() << "ubuntu-app-launch threw an exception getting app info for appId:" << appId << ":" << e.what();
50 qWarning() << "ubuntu-app-launch threw an exception getting app info for appId:" << appId << ":" << e.what();
46 }
51 }