mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Merge branch 'Applications/16.08'
* Applications/16.08: Don't load twice kfileitemaction plugins with json metadata Fix logic for loading kfileitemaction plugins
This commit is contained in:
commit
87ddbf770e
|
@ -498,10 +498,6 @@ void DolphinContextMenu::addFileItemPluginActions()
|
|||
}
|
||||
|
||||
const KService::List pluginServices = KMimeTypeTrader::self()->query(commonMimeType, QStringLiteral("KFileItemAction/Plugin"), QStringLiteral("exist Library"));
|
||||
if (pluginServices.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);
|
||||
const KConfigGroup showGroup = config.group("Show");
|
||||
|
||||
|
@ -551,6 +547,7 @@ void DolphinContextMenu::addFileItemPluginActions()
|
|||
if (abstractPlugin) {
|
||||
abstractPlugin->setParent(this);
|
||||
addActions(abstractPlugin->actions(props, m_mainWindow));
|
||||
addedPlugins << jsonMetadata.pluginId();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue