[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdeconnect-kde/sslrefactor] core: Restore having plugins without any capabilities
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2016-05-31 18:26:55
Message-ID: E1b7oNT-0006a8-L9 () scm ! kde ! org
[Download RAW message or body]

Git commit 16eccd46d301599fad6c1c01323ab89ec1f004b4 by Aleix Pol.
Committed on 31/05/2016 at 18:16.
Pushed by apol into branch 'sslrefactor'.

Restore having plugins without any capabilities

These won't need to be matched by the other device

M  +3    -1    core/device.cpp

http://commits.kde.org/kdeconnect-kde/16eccd46d301599fad6c1c01323ab89ec1f004b4

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()
             ) {


[prev in list] [next in list] [prev in thread] [next in thread]