[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:41 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=16eccd4
The following commit has been merged in the master branch:
commit 16eccd46d301599fad6c1c01323ab89ec1f004b4
Author: Aleix Pol <aleixpol at kde.org>
Date: Tue May 31 20:16:25 2016 +0200
Restore having plugins without any capabilities
These won't need to be matched by the other device
---
core/device.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/core/device.cpp b/core/device.cpp
index d0112a4..9b82b9c 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -125,9 +125,11 @@ void Device::reloadPlugins()
supportedOutgoingInterfaces += outgoingInterfaces;
}
+ const bool pluginNeedsCapabilities = !m_incomingCapabilities.isEmpty() || !m_outgoingCapabilities.isEmpty();
+
//If we don't find intersection with the received on one end and the sent on the other, we don't
//let the plugin stay
- if (capabilitiesSupported
+ if (capabilitiesSupported && pluginNeedsCapabilities
&& (m_incomingCapabilities & outgoingInterfaces).isEmpty()
&& (m_outgoingCapabilities & incomingInterfaces).isEmpty()
) {
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list