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@kde.org
CCMAIL:plasma-devel@kde.org

Reviewed-by: Eike Hein on IRC
wilder-5.14
Sebastian Kügler 12 years ago
parent c9b0480069
commit 95ce6207c5
  1. 4
      applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
  2. 4
      dataengines/statusnotifieritem/statusnotifieritemsource.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'";

@ -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'";
}

Loading…
Cancel
Save