[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=b168312

The following commit has been merged in the master branch:
commit b1683127a66a53b1436edd03406bb0e674d6d986
Author: Samoilenko Yuri <kinnalru at gmail.com>
Date:   Sat Jan 18 02:07:30 2014 +0400

    Private key bugfix
---
 kded/device.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kded/device.cpp b/kded/device.cpp
index 3d0566e..ed67441 100644
--- a/kded/device.cpp
+++ b/kded/device.cpp
@@ -52,13 +52,13 @@ Device::Device(const NetworkPackage& identityPackage, DeviceLink* dl)
     , m_pairStatus(Device::NotPaired)
     , m_protocolVersion(identityPackage.get<int>("protocolVersion"))
 {
-    addLink(identityPackage, dl);
-
     QFile privKey(KSharedConfig::openConfig("kdeconnectrc")->group("myself").readEntry("privateKey"));
     if (privKey.open(QIODevice::ReadOnly))
     {
         m_privateKey = QCA::PrivateKey::fromPEM(privKey.readAll());
     }
+
+    addLink(identityPackage, dl);
     
     //Register in bus
     QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
@@ -217,6 +217,7 @@ void Device::addLink(const NetworkPackage& identityPackage, DeviceLink* link)
     m_deviceName = identityPackage.get<QString>("deviceName");
     m_deviceType = str2type(identityPackage.get<QString>("deviceType"));
 
+    Q_ASSERT(!m_privateKey.isNull());
     link->setPrivateKey(m_privateKey);
 
     //Theoretically we will never add two links from the same provider (the provider should destroy

-- 
kdeconnect packaging