From 9834fd23ab4778db7e9541e39cf6db8259e7f8f2 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 5 Sep 2016 00:29:58 +0200 Subject: GIT_SILENT Upgrade KDE Applications version to 16.08.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e94c97ba..d793b029f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(Dolphin) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") -- cgit v1.3 From abaf20f11409657888b1442c3d6c745de1d8f0c9 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sat, 10 Sep 2016 21:52:02 +0200 Subject: Fix logic for loading kfileitemaction plugins Since dolphin is now loading also plugins with json metadata, it is wrong to return here, as those plugins could be missed. --- src/dolphincontextmenu.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 9507ba0a8..5bfa06689 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -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"); -- cgit v1.3 From e93e6d4cc5231c5ee209f1ac9df70bbb253ce786 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sat, 10 Sep 2016 21:57:58 +0200 Subject: Don't load twice kfileitemaction plugins with json metadata --- src/dolphincontextmenu.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 5bfa06689..971ef1e35 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -547,6 +547,7 @@ void DolphinContextMenu::addFileItemPluginActions() if (abstractPlugin) { abstractPlugin->setParent(this); addActions(abstractPlugin->actions(props, m_mainWindow)); + addedPlugins << jsonMetadata.pluginId(); } } } -- cgit v1.3