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

* prevent potential crash introduced with scripting support (non-init'd AbstractRunner*)

Browse Source 
* get the args right

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=772449
This commit is contained in:
Aaron J. Seigo 2008-02-08 19:21:25 +00:00
parent 293a4dc07d
commit 5f0afdd61c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
abstractrunner.cpp
View File

@ -199,7 +199,7 @@ void AbstractRunner::match(Plasma::SearchContext *search)
QString AbstractRunner::runnerName() const
{
if (!d->runnerDescription.isValid()) {
return QString();
return objectName();
}
return d->runnerDescription.property("X-Plasma-RunnerName").toString();
}
@ -219,17 +219,19 @@ AbstractRunner::List AbstractRunner::loadRunners(QObject* parent, const QStringL
KService::List offers = KServiceTypeTrader::self()->query("Plasma/Runner");
QString error;
QVariantList allArgs;
foreach (KService::Ptr service, offers) {
if( whitelist.empty() || whitelist.contains( service->name() ) ) {
allArgs << service->storageId();
if (whitelist.empty() || whitelist.contains(service->name())) {
QString language = service->property("X-Plasma-Language").toString();
AbstractRunner* runner;
AbstractRunner* runner = 0;
if (language.isEmpty()) {
runner = service->createInstance<AbstractRunner>(parent, allArgs, &error);
QVariantList args;
args << service->storageId();
runner = service->createInstance<AbstractRunner>(parent, args, &error);
} else {
runner = new AbstractRunner(parent, service->storageId());
}
if (runner) {
//kDebug() << "loaded runner : " << service->name();
QString phase = service->property("X-Plasma-RunnerPhase").toString();
@ -240,8 +242,7 @@ AbstractRunner::List AbstractRunner::loadRunners(QObject* parent, const QStringL
} else {
runners.append(runner);
}
}
else {
} else {
kDebug() << "failed to load runner : " << service->name() << ". error reported: " << error;
}
}