[plasma-workspace] /: Move path argument into KIconLoader ctor

[Sebastian Kügler]

Git commit 95ce6207c596714e3e9e8578dcc80fd8832b934d by Sebastian Kügler.
Committed on 01/07/2014 at 22:24.
Pushed by sebas into branch 'master'.

Move path argument into KIconLoader ctor

This is needed to build against KIconThemes 6a75883159bbeb9, which
reverts the commit that adds the path to the addAppDir call. From
looking at the API docs, this *seems* to be the right fix, but I don't
know how to test this properly, so I can't confirm that this actually
works. It builds though, and that's at least a step forward.

If someone can test this, that would be very useful.

CCMAIL:mklapetek at kde.org
CCMAIL:plasma-devel at kde.org

Reviewed-by: Eike Hein on IRC

M  +2    -2    applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
M  +2    -2    dataengines/statusnotifieritem/statusnotifieritemsource.cpp

http://commits.kde.org/plasma-workspace/95ce6207c596714e3e9e8578dcc80fd8832b934d

diff --git a/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp b/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
index 14458e9..60f3997 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(), this);
-                m_customIconLoader->addAppDir(appName, path);
+                m_customIconLoader = new KIconLoader(appName, QStringList() << path, this);
+                m_customIconLoader->addAppDir(appName);
                 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 04cbc1a..3f5a410 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(), this);
+                    m_customIconLoader = new KIconLoader(appName, QStringList() << path, this);
                 }
-                m_customIconLoader->addAppDir(appName, path);
+                m_customIconLoader->addAppDir(appName);
             } else {
                 qWarning() << "Wrong IconThemePath" << path << ": too short or does not end with 'icons'";
             }