[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=89afa5b

The following commit has been merged in the master branch:
commit 89afa5b9af98867e436846d950102455376bc39b
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Fri Sep 11 05:20:46 2015 -0700

    Renamed capabilties so we don't clash with KDE4's broken implementation
---
 core/device.cpp         | 12 ++++++------
 core/networkpackage.cpp |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index b30ae3f..71c4d0c 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -184,8 +184,8 @@ void Device::reloadPlugins()
     if (capabilitiesChanged && isReachable() && isPaired())
     {
         NetworkPackage np(PACKAGE_TYPE_CAPABILITIES);
-        np.set<QStringList>("SupportedIncomingInterfaces", newSupportedIncomingInterfaces);
-        np.set<QStringList>("SupportedOutgoingInterfaces", newPluginsByOutgoingInterface.keys());
+        np.set<QStringList>("IncomingCapabilities", newSupportedIncomingInterfaces);
+        np.set<QStringList>("OutgoingCapabilities", newPluginsByOutgoingInterface.keys());
         sendPackage(np);
     }
 }
@@ -298,8 +298,8 @@ 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>("SupportedIncomingInterfaces", QStringList()).toSet();
-        m_outgoingCapabilities = identityPackage.get<QStringList>("SupportedOutgoingInterfaces", QStringList()).toSet();
+        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 {
@@ -405,8 +405,8 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
         }
 
     } else if (np.type() == PACKAGE_TYPE_CAPABILITIES) {
-        QSet<QString> newIncomingCapabilities = np.get<QStringList>("SupportedIncomingInterfaces", QStringList()).toSet();
-        QSet<QString> newOutgoingCapabilities = np.get<QStringList>("SupportedOutgoingInterfaces", QStringList()).toSet();
+        QSet<QString> newIncomingCapabilities = np.get<QStringList>("IncomingCapabilities", QStringList()).toSet();
+        QSet<QString> newOutgoingCapabilities = np.get<QStringList>("OutgoingCapabilities", QStringList()).toSet();
 
         if (newOutgoingCapabilities != m_outgoingCapabilities || newIncomingCapabilities != m_incomingCapabilities) {
             m_incomingCapabilities = newIncomingCapabilities;
diff --git a/core/networkpackage.cpp b/core/networkpackage.cpp
index 8bdc2ad..d521b4a 100644
--- a/core/networkpackage.cpp
+++ b/core/networkpackage.cpp
@@ -59,8 +59,8 @@ void NetworkPackage::createIdentityPackage(NetworkPackage* np)
     np->set("deviceName", config->name());
     np->set("deviceType", config->deviceType());
     np->set("protocolVersion",  NetworkPackage::ProtocolVersion);
-    np->set("SupportedIncomingInterfaces", PluginLoader::instance()->incomingInterfaces());
-    np->set("SupportedOutgoingInterfaces", PluginLoader::instance()->outgoingInterfaces());
+    np->set("IncomingCapabilities", PluginLoader::instance()->incomingInterfaces());
+    np->set("OutgoingCapabilities", PluginLoader::instance()->outgoingInterfaces());
 
     //qCDebug(KDECONNECT_CORE) << "createIdentityPackage" << np->serialize();
 }

-- 
kdeconnect packaging