[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=0e96d83

The following commit has been merged in the master branch:
commit 0e96d837ffc824d9285d9af1b3e6ea2736d94dde
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sat Mar 14 02:44:21 2015 +0100

    Make sure the capabilities don't change over time by constifying
    
    It exposed a problem later on, where we'd end up removing our own
    capabilities into the remote's.
---
 core/device.cpp | 4 ++--
 core/device.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index fcd13b6..829f23c 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -133,8 +133,8 @@ void Device::reloadPlugins()
                 //Also, if no capabilities are specified on the other end, we don't apply this optimizaton, as
                 //we asume that the other client doesn't know about capabilities.
                 if (!m_incomingCapabilities.isEmpty() && !m_outgoingCapabilities.isEmpty()
-                    && m_incomingCapabilities.intersect(outgoingInterfaces.toSet()).isEmpty()
-                    && m_outgoingCapabilities.intersect(incomingInterfaces.toSet()).isEmpty()
+                    && (m_incomingCapabilities & outgoingInterfaces.toSet()).isEmpty()
+                    && (m_outgoingCapabilities & incomingInterfaces.toSet()).isEmpty()
                 ) {
                     delete plugin;
                     continue;
diff --git a/core/device.h b/core/device.h
index ab57943..aefb2aa 100644
--- a/core/device.h
+++ b/core/device.h
@@ -135,8 +135,8 @@ private:
     QMultiMap<QString, KdeConnectPlugin*> m_pluginsByOutgoingInterface;
 
     QTimer m_pairingTimeut;
-    QSet<QString> m_incomingCapabilities;
-    QSet<QString> m_outgoingCapabilities;
+    const QSet<QString> m_incomingCapabilities;
+    const QSet<QString> m_outgoingCapabilities;
 
     void setAsPaired();
     bool sendOwnPublicKey();

-- 
kdeconnect packaging