Git commit ea2619baa91a4684609591b3ce78ec3455a25509 by Sebastian Kügler.
Committed on 02/07/2014 at 13:45.
Pushed by sebas into branch 'master'.
Revert 95ce6207c59671
Quoting the KIconThemes change that lead to this change:
Revert "Revert "Allow passing custom theme base path together with custom
app themes""
This reverts commit 6a75883159bbeb9a9316436d428d2617c3b5fc96.
This was never intended to be pushed, it was a local test for the testcase
in RR119058. Sorry for the mixup.
We're back to good now.
CCMAIL:mklape...@kde.org
CCMAIL:plasma-devel@kde.org
M +2 -2
applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
M +2 -2 dataengines/statusnotifieritem/statusnotifieritemsource.cpp
http://commits.kde.org/plasma-workspace/ea2619baa91a4684609591b3ce78ec3455a25509
diff --git
a/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
b/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
index 60f3997..14458e9 100644
--- a/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
+++ b/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
@@ -370,8 +370,8 @@ void DBusSystemTrayTask::syncIcons(const
Plasma::DataEngine::Data &properties)
// adding all application dirs to KIconLoader::global(), to
// avoid potential icon name clashes between application
// icons
- m_customIconLoader = new KIconLoader(appName, QStringList() <<
path, this);
- m_customIconLoader->addAppDir(appName);
+ m_customIconLoader = new KIconLoader(appName, QStringList(),
this);
+ m_customIconLoader->addAppDir(appName, path);
is_icon_changed = true;
} else {
qWarning() << "Wrong IconThemePath" << path << ": too short or
does not end with 'icons'";
diff --git a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
index 3f5a410..04cbc1a 100644
--- a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
+++ b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
@@ -217,9 +217,9 @@ void
StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call)
QString appName = tokens.takeLast();
if (!m_customIconLoader) {
- m_customIconLoader = new KIconLoader(appName,
QStringList() << path, this);
+ m_customIconLoader = new KIconLoader(appName,
QStringList(), this);
}
- m_customIconLoader->addAppDir(appName);
+ m_customIconLoader->addAppDir(appName, path);
} else {
qWarning() << "Wrong IconThemePath" << path << ": too short or
does not end with 'icons'";
}
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
