alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

restore load/save behaviour for krunner; short term fix only, however. this needs to be fixed in krunner (and possibly have RunnerManager extended a bit to make this less error prone) but it would be nice for krunner to be useful to others while i work on fixing this up...

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1034974
This commit is contained in:
Aaron J. Seigo 2009-10-14 05:50:17 +00:00
parent ee461e739e
commit 8e9ad3cfcf
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
runnermanager.cpp
View File

@ -116,9 +116,15 @@ public:
KConfigGroup config = configGroup();
KService::List offers = KServiceTypeTrader::self()->query("Plasma/Runner");
bool loadAll = config.readEntry("loadAll", false);
const bool loadAll = config.readEntry("loadAll", false);
QStringList whiteList = config.readEntry("pluginWhiteList", QStringList());
KConfigGroup pluginConf(&config, "Plugins");
const bool noWhiteList = whiteList.isEmpty();
KConfigGroup pluginConf;
if (conf.isValid()) {
pluginConf = KConfigGroup(&conf, "Plugins");
} else {
pluginConf = KConfigGroup(KGlobal::config(), "Plugins");
}
foreach (const KService::Ptr &service, offers) {
//kDebug() << "Loading runner: " << service->name() << service->storageId();
@ -133,10 +139,11 @@ public:
QString runnerName = description.pluginName();
description.load(pluginConf);
bool loaded = runners.contains(runnerName);
bool selected = loadAll ||
description.isPluginEnabled() && (whiteList.isEmpty() || whiteList.contains(runnerName));
const bool loaded = runners.contains(runnerName);
const bool selected = loadAll ||
(description.isPluginEnabled() && (noWhiteList || whiteList.contains(runnerName)));
//kDebug() << loadAll << description.isPluginEnabled() << noWhiteList << whiteList.contains(runnerName);
if (selected) {
if (!loaded) {
QString api = service->property("X-Plasma-API").toString();