File 0005-Specify-explicit-fallbacks.patch of Package plasma5-desktop.openSUSE_13.2_Update
From aa08cd42a470af7a10f34cc9dbe7aefd0057bb35 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Wed, 1 Apr 2015 15:49:30 +0200
Subject: [PATCH 05/11] Specify explicit fallbacks.
---
applets/kicker/plugin/appsmodel.cpp | 4 ++--
applets/kicker/plugin/recentdocsmodel.cpp | 2 +-
applets/kicker/plugin/rootmodel.cpp | 2 +-
applets/kicker/plugin/systemmodel.cpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/applets/kicker/plugin/appsmodel.cpp b/applets/kicker/plugin/appsmodel.cpp
index 523e64e0c92f988a37b56b39b39a483a11f834b2..e3091915b057dbcf117dec7ece6601a5b758d668 100644
--- a/applets/kicker/plugin/appsmodel.cpp
+++ b/applets/kicker/plugin/appsmodel.cpp
@@ -50,7 +50,7 @@ AppGroupEntry::AppGroupEntry(KServiceGroup::Ptr group, AppsModel *parentModel,
bool flat, int appNameFormat)
{
m_name = group->caption();
- m_icon = QIcon::fromTheme(group->icon());
+ m_icon = QIcon::fromTheme(group->icon(), QIcon::fromTheme("unknown"));
AppsModel* model = new AppsModel(group->entryPath(), flat, parentModel);
model->setAppletInterface(parentModel->appletInterface());
model->setAppNameFormat(appNameFormat);
@@ -64,7 +64,7 @@ AppEntry::AppEntry(KService::Ptr service, const QString &name)
: m_service(service)
{
m_name = name;
- m_icon = QIcon::fromTheme(service->icon());
+ m_icon = QIcon::fromTheme(service->icon(), QIcon::fromTheme("unknown"));
m_service = service;
}
diff --git a/applets/kicker/plugin/recentdocsmodel.cpp b/applets/kicker/plugin/recentdocsmodel.cpp
index 810b5cba786f7012416c79c3512b8cddb846ab1b..8c80019f9629ea1a8951e215cdc370093f982784 100644
--- a/applets/kicker/plugin/recentdocsmodel.cpp
+++ b/applets/kicker/plugin/recentdocsmodel.cpp
@@ -34,7 +34,7 @@ DocEntry::DocEntry(const QString &name, const QString &icon,
const QString &url, const QString &desktopPath)
{
m_name = name;
- m_icon = QIcon::fromTheme(icon);
+ m_icon = QIcon::fromTheme(icon, QIcon::fromTheme("unknown"));
m_url = url;
m_desktopPath = desktopPath;
}
diff --git a/applets/kicker/plugin/rootmodel.cpp b/applets/kicker/plugin/rootmodel.cpp
index 3b801a02c704070a0cc694c28337d8c48b4636d9..7bc7552ff6051c176d1c56d2e167cdf733984d50 100644
--- a/applets/kicker/plugin/rootmodel.cpp
+++ b/applets/kicker/plugin/rootmodel.cpp
@@ -29,7 +29,7 @@ GroupEntry::GroupEntry(const QString &name, const QString &icon,
AbstractModel *model, AbstractModel *parentModel)
{
m_name = name;
- m_icon = QIcon::fromTheme(icon);
+ m_icon = QIcon::fromTheme(icon, QIcon::fromTheme("unknown"));
m_model = model;
QObject::connect(parentModel, SIGNAL(refreshing()), m_model, SLOT(deleteLater()));
}
diff --git a/applets/kicker/plugin/systemmodel.cpp b/applets/kicker/plugin/systemmodel.cpp
index 03454c1eeba0879dcd0bb9b3f1a1a94511393811..301b42dc85ea136601bf9b5892925b149e384cba 100644
--- a/applets/kicker/plugin/systemmodel.cpp
+++ b/applets/kicker/plugin/systemmodel.cpp
@@ -36,7 +36,7 @@ SystemEntry::SystemEntry(SystemEntry::Action action, const QString &name, const
{
m_action = action;
m_name = name;
- m_icon = QIcon::fromTheme(icon);
+ m_icon = QIcon::fromTheme(icon, QIcon::fromTheme("unknown"));
}
SystemModel::SystemModel(QObject *parent) : AbstractModel(parent)
--
2.3.4