[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:04 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=c2acc37
The following commit has been merged in the master branch:
commit c2acc37da6d1c631a9b125f3211cca123cee9bb4
Author: Aleix Pol <aleixpol at kde.org>
Date: Fri Sep 11 13:56:51 2015 +0200
Fix filtering of plugins that don't support capabilities
---
core/device.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/core/device.cpp b/core/device.cpp
index d53b3c5..c182cc4 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -117,6 +117,7 @@ void Device::reloadPlugins()
KConfigGroup pluginStates = KSharedConfig::openConfig(pluginsConfigFile())->group("Plugins");
PluginLoader* loader = PluginLoader::instance();
+ const bool deviceSupportsCapabilities = !m_incomingCapabilities.isEmpty() || !m_outgoingCapabilities.isEmpty();
//Code borrowed from KWin
foreach (const QString& pluginName, loader->getPluginList()) {
@@ -141,7 +142,8 @@ void Device::reloadPlugins()
//let the plugin stay
//Also, if no capabilities are specified on the other end, we don't apply this optimizaton, as
//we assume that the other client doesn't know about capabilities.
- if (!m_incomingCapabilities.isEmpty() && !m_outgoingCapabilities.isEmpty()
+ const bool capabilitiesSupported = deviceSupportsCapabilities && (!incomingInterfaces.isEmpty() || !outgoingInterfaces.isEmpty());
+ if (capabilitiesSupported
&& (m_incomingCapabilities & outgoingInterfaces.toSet()).isEmpty()
&& (m_outgoingCapabilities & incomingInterfaces.toSet()).isEmpty()
) {
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list