From ceba21c7399d82bc1406b96dde399ea6e42105d1 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 19 Nov 2019 16:01:03 +0000 Subject: [PATCH] plasma: do not require icons path for notifier items the only requirement, by the spec, is that the icon name is Freedesktop-compliant which means it can in $HOME/.icons or any other compliant path Signed-off-by: Ivailo Monev --- .../systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp | 3 +-- .../statusnotifieritem/statusnotifieritemsource.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp b/plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp index 2473cd81..224c7b27 100644 --- a/plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp +++ b/plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp @@ -325,9 +325,8 @@ void DBusSystemTrayTask::syncIcons(const Plasma::DataEngine::Data &properties) } const QString path = m_iconThemePath; if (!path.isEmpty()) { - // FIXME: If last part of path is not "icons", this won't work! QStringList tokens = path.split('/', QString::SkipEmptyParts); - if (tokens.length() >= 3 && tokens.takeLast() == QLatin1String("icons")) { + if (tokens.length() >= 3) { QString appName = tokens.takeLast(); QString prefix = QChar('/') + tokens.join("/"); // FIXME: Fix KIconLoader and KIconTheme so that we can use diff --git a/plasma/dataengines/statusnotifieritem/statusnotifieritemsource.cpp b/plasma/dataengines/statusnotifieritem/statusnotifieritemsource.cpp index 7d65b68d..d4c61ad7 100644 --- a/plasma/dataengines/statusnotifieritem/statusnotifieritemsource.cpp +++ b/plasma/dataengines/statusnotifieritem/statusnotifieritemsource.cpp @@ -214,9 +214,8 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call) if (!m_customIconLoader) { QString path = properties["IconThemePath"].toString(); if (!path.isEmpty()) { - // FIXME: If last part of path is not "icons", this won't work! QStringList tokens = path.split('/', QString::SkipEmptyParts); - if (tokens.length() >= 3 && tokens.takeLast() == "icons") { + if (tokens.length() >= 3) { QString appName = tokens.takeLast(); QString prefix = '/' + tokens.join("/"); // FIXME: Fix KIconLoader and KIconTheme so that we can use