[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=4383a42

The following commit has been merged in the master branch:
commit 4383a42703b51277ba6ff30fcc96f8c6d3929f28
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue May 31 20:10:35 2016 +0200

    Changed the way we detect if capabilities are supported
---
 core/device.cpp         | 7 +------
 core/networkpackage.cpp | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index c335398..d0112a4 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -111,7 +111,7 @@ void Device::reloadPlugins()
         KConfigGroup pluginStates = KSharedConfig::openConfig(pluginsConfigFile())->group("Plugins");
 
         PluginLoader* loader = PluginLoader::instance();
-        const bool deviceSupportsCapabilities = !m_incomingCapabilities.isEmpty() || !m_outgoingCapabilities.isEmpty();
+        const bool capabilitiesSupported = (m_protocolVersion >= 6);
 
         foreach (const QString& pluginName, loader->getPluginList()) {
             const KPluginMetaData service = loader->getPluginInfo(pluginName);
@@ -127,9 +127,6 @@ void Device::reloadPlugins()
 
             //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
-            //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.
-            const bool capabilitiesSupported = deviceSupportsCapabilities && (!incomingInterfaces.isEmpty() || !outgoingInterfaces.isEmpty());
             if (capabilitiesSupported
                 && (m_incomingCapabilities & outgoingInterfaces).isEmpty()
                 && (m_outgoingCapabilities & incomingInterfaces).isEmpty()
@@ -272,8 +269,6 @@ void Device::addLink(const NetworkPackage& identityPackage, DeviceLink* link)
     qSort(m_deviceLinks.begin(), m_deviceLinks.end(), lessThan);
 
     if (m_deviceLinks.size() == 1) {
-        m_incomingCapabilities = identityPackage.get<QStringList>("IncomingCapabilities", QStringList()).toSet();
-        m_outgoingCapabilities = identityPackage.get<QStringList>("OutgoingCapabilities", QStringList()).toSet();
         reloadPlugins(); //Will load the plugins
         Q_EMIT reachableStatusChanged();
     } else {
diff --git a/core/networkpackage.cpp b/core/networkpackage.cpp
index 2e2d975..59bd21b 100644
--- a/core/networkpackage.cpp
+++ b/core/networkpackage.cpp
@@ -59,8 +59,6 @@ void NetworkPackage::createIdentityPackage(NetworkPackage* np)
     np->set("deviceName", config->name());
     np->set("deviceType", config->deviceType());
     np->set("protocolVersion",  NetworkPackage::ProtocolVersion);
-    np->set("IncomingCapabilities", PluginLoader::instance()->incomingInterfaces());
-    np->set("OutgoingCapabilities", PluginLoader::instance()->outgoingInterfaces());
 
     //qCDebug(KDECONNECT_CORE) << "createIdentityPackage" << np->serialize();
 }

-- 
kdeconnect packaging