yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix loading of effect config plugins

Browse source 
X-KDE-ParentComponents is a list, so we have to check if this list
contains the plugin, not do a string comparison. It seems the
queryparser has become a bit stricter in this case. This query should be
fixed anyway, however, and it fixes a fairly important bug in the effect
system.

REVIEW:122821
This commit is contained in:
Sebastian Kügler 2015-03-05 00:44:47 +01:00
parent 777dc69831
commit 25fc115a9c
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwincompositing/effectconfig.cpp
View file

@ -65,7 +65,7 @@ void EffectConfig::openConfig(const QString &serviceName, bool scripted, const Q
} }
} else { } else {
kcm = KPluginTrader::createInstanceFromQuery<KCModule>(s_pluginDir, QString(), kcm = KPluginTrader::createInstanceFromQuery<KCModule>(s_pluginDir, QString(),
QStringLiteral("[X-KDE-ParentComponents] == '%1'").arg(serviceName), QStringLiteral("'%1' in [X-KDE-ParentComponents]").arg(serviceName),
&dialog); &dialog);
} }
if (!kcm) { if (!kcm) {

2
kcmkwin/kwindesktop/main.cpp
View file

@ -619,7 +619,7 @@ void KWinDesktopConfig::slotConfigureEffectClicked()
QPointer<QDialog> configDialog = new QDialog(this); QPointer<QDialog> configDialog = new QDialog(this);
KCModule *kcm = KPluginTrader::createInstanceFromQuery<KCModule>(QStringLiteral("kwin/effects/configs/"), QString(), KCModule *kcm = KPluginTrader::createInstanceFromQuery<KCModule>(QStringLiteral("kwin/effects/configs/"), QString(),
QStringLiteral("[X-KDE-ParentComponents] == '%1'").arg(effect), QStringLiteral("'%1' in [X-KDE-ParentComponents]").arg(effect),
configDialog); configDialog);
if (!kcm) { if (!kcm) {
delete configDialog; delete configDialog;

2
kcmkwin/kwintabbox/main.cpp
View file

@ -539,7 +539,7 @@ void KWinTabBoxConfig::configureEffectClicked()
const QString name = BuiltInEffects::nameForEffect(effect == CoverSwitch ? BuiltInEffect::CoverSwitch : BuiltInEffect::FlipSwitch); const QString name = BuiltInEffects::nameForEffect(effect == CoverSwitch ? BuiltInEffect::CoverSwitch : BuiltInEffect::FlipSwitch);
KCModule *kcm = KPluginTrader::createInstanceFromQuery<KCModule>(QStringLiteral("kwin/effects/configs/"), QString(), KCModule *kcm = KPluginTrader::createInstanceFromQuery<KCModule>(QStringLiteral("kwin/effects/configs/"), QString(),
QStringLiteral("[X-KDE-ParentComponents] == '%1'").arg(name), QStringLiteral("'%1' in [X-KDE-ParentComponents]").arg(name),
configDialog); configDialog);
if (!kcm) { if (!kcm) {
delete configDialog; delete configDialog;