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

and optional ones now too

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1047346
This commit is contained in:
Aaron J. Seigo 2009-11-11 02:12:40 +00:00
parent 9d91ea5a8c
commit 27f4697300
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scriptengines/javascript/simplejavascriptapplet.cpp
View File

@ -388,16 +388,30 @@ bool SimpleJavaScriptApplet::importExtensions()
i18n("Authorization for required extension '%1' was denied.",
extension));
return false;
} else {
m_engine->importExtension(extension);
if (m_engine->hasUncaughtException()) {
reportError(m_engine, true);
return false;
}
}
m_engine->importExtension(extension);
if (m_engine->hasUncaughtException()) {
reportError(m_engine, true);
return false;
}
}
QStringList optionalExtensions = info.property("X-Plasma-OptionalExtensions").toStringList();
foreach (const QString &extension, requiredExtensions) {
if (!applet()->hasAuthorization(extension)) {
setFailedToLaunch(true,
i18n("Authorization for required extension '%1' was denied.",
extension));
continue;
}
m_engine->importExtension(extension);
if (m_engine->hasUncaughtException()) {
reportError(m_engine);
}
}
kDebug() << "extensions are" << optionalExtensions;
return true;