kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/16.08'

Browse source 
* Applications/16.08:
  Don't load twice kfileitemaction plugins with json metadata
  Fix logic for loading kfileitemaction plugins
This commit is contained in:
Elvis Angelaccio 2016-09-10 22:01:09 +02:00
parent b706108206 e93e6d4cc5
commit 87ddbf770e
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dolphincontextmenu.cpp
View file

@ -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();
}
}
}