[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=2ca7436

The following commit has been merged in the master branch:
commit 2ca7436e2cb1c668f50a61df0ff4d9442cd6f017
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Wed Nov 6 21:31:37 2013 +0100

    Device now reads and keeps the deviceType it receives in identityPackages
---
 kded/device.cpp | 18 ++++++++++++++++++
 kded/device.h   | 11 +++++++++++
 2 files changed, 29 insertions(+)

diff --git a/kded/device.cpp b/kded/device.cpp
index 77bd86d..135f8b8 100644
--- a/kded/device.cpp
+++ b/kded/device.cpp
@@ -26,6 +26,7 @@ Device::Device(const QString& id)
     KConfigGroup data = config->group("trusted_devices").group(id);
 
     m_deviceName = data.readEntry<QString>("deviceName", QString("unnamed"));
+    m_deviceType = str2type(data.readEntry<QString>("deviceType", QLatin1String("unknown")));
 
     const QString& key = data.readEntry<QString>("publicKey",QString());
     m_publicKey = QCA::RSAPublicKey::fromPEM(key);
@@ -38,6 +39,7 @@ Device::Device(const QString& id)
 Device::Device(const NetworkPackage& identityPackage, DeviceLink* dl)
     : m_deviceId(identityPackage.get<QString>("deviceId"))
     , m_deviceName(identityPackage.get<QString>("deviceName"))
+    , m_deviceType(str2type(identityPackage.get<QString>("deviceType")))
     , m_pairStatus(Device::NotPaired)
     , m_protocolVersion(identityPackage.get<int>("protocolVersion"))
 {
@@ -203,6 +205,7 @@ void Device::addLink(const NetworkPackage& identityPackage, DeviceLink* link)
 
     //re-read the device name from the identityPackage because it could have changed
     m_deviceName = identityPackage.get<QString>("deviceName");
+    m_deviceType = str2type(identityPackage.get<QString>("deviceType"));
 
     //TODO: Do not read the key every time
     KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc");
@@ -419,3 +422,18 @@ void Device::sendPing()
     qDebug() << "sendPing:" << success;
 }
 
+static DeviceType Device::str2type(QString deviceType) {
+    if (deviceType == "desktop") return Desktop;
+    if (deviceType == "laptop") return Laptop;
+    if (deviceType == "phone") return Phone;
+    if (deviceType == "tablet") return Tablet;
+    return Unknown;
+}
+
+static QString Device::type2str(DeviceType deviceType) {
+    if (deviceType == Desktop) return "desktop";
+    if (deviceType == Laptop) return "laptop";
+    if (deviceType == Phone) return "phone";
+    if (deviceType == Tablet) return "tablet";
+    return "unknown";
+}
\ No newline at end of file
diff --git a/kded/device.h b/kded/device.h
index e01cc9b..7a8fd1f 100644
--- a/kded/device.h
+++ b/kded/device.h
@@ -48,6 +48,16 @@ class Device
         Paired,
     };
 
+    enum DeviceType {
+        Unknown,
+        Desktop,
+        Laptop,
+        Phone,
+        Tablet,
+    };
+    static DeviceType str2type(QString deviceType);
+    static QString type2str(DeviceType deviceType);
+
 public:
     /**
      * Reads the @p device from KConfig
@@ -111,6 +121,7 @@ private:
     //TODO: Replace device id by public key
     const QString m_deviceId;
     QString m_deviceName;
+    DeviceType m_deviceType;
     QCA::PublicKey m_publicKey;
     PairStatus m_pairStatus;
     int m_protocolVersion;

-- 
kdeconnect packaging