[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=4363ea8

The following commit has been merged in the master branch:
commit 4363ea8fdb0cd2c10324b9cbe32496969154a969
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Oct 1 01:09:20 2013 +0200

    Device class now stores the protocolVersion of the device
---
 kded/device.cpp | 7 +++----
 kded/device.h   | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kded/device.cpp b/kded/device.cpp
index 4c9712b..035d3a2 100644
--- a/kded/device.cpp
+++ b/kded/device.cpp
@@ -44,10 +44,9 @@ Device::Device(const NetworkPackage& identityPackage, DeviceLink* dl)
     m_deviceId = identityPackage.get<QString>("deviceId");
     m_deviceName = identityPackage.get<QString>("deviceName");
 
-    int protocolVersion = identityPackage.get<int>("protocolVersion");
-    if (protocolVersion != NetworkPackage::ProtocolVersion) {
-        qDebug() << m_deviceName << "- warning, device uses a different protocol version" << protocolVersion << "expected" << NetworkPackage::ProtocolVersion;
-        //TODO: Do something
+    m_protocolVersion = identityPackage.get<int>("protocolVersion");
+    if (m_protocolVersion != NetworkPackage::ProtocolVersion) {
+        qWarning() << m_deviceName << "- warning, device uses a different protocol version" << m_protocolVersion << "expected" << NetworkPackage::ProtocolVersion;
     }
 
     addLink(dl);
diff --git a/kded/device.h b/kded/device.h
index 04f4462..ea87dea 100644
--- a/kded/device.h
+++ b/kded/device.h
@@ -102,10 +102,12 @@ Q_SIGNALS:
     Q_SCRIPTABLE void unpaired();
 
 private:
+    //TODO: Replace device id by public key
     QString m_deviceId;
     QString m_deviceName;
     QCA::PublicKey m_publicKey;
     PairStatus m_pairStatus;
+    int m_protocolVersion;
 
     QList<DeviceLink*> m_deviceLinks;
     QMap<QString, KdeConnectPlugin*> m_plugins;

-- 
kdeconnect packaging