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

The following commit has been merged in the master branch:
commit e10b2e80c9d646fba3863401d00fee113fd2c54e
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Dec 6 01:51:53 2015 +0100

    Propagate pairing errors
---
 core/backends/devicelink.h            | 1 +
 core/backends/lan/lanlinkprovider.cpp | 5 +++--
 core/device.cpp                       | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/backends/devicelink.h b/core/backends/devicelink.h
index b9de66a..5982272 100644
--- a/core/backends/devicelink.h
+++ b/core/backends/devicelink.h
@@ -63,6 +63,7 @@ public:
 Q_SIGNALS:
     void receivedPackage(const NetworkPackage& np);
     void pairStatusChanged(DeviceLink::PairStatus status);
+    void pairingError(const QString &error);
 
 protected:
     QCA::PrivateKey mPrivateKey;
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 990b618..d726c4a 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -471,7 +471,8 @@ void LanLinkProvider::userRequestsPair(const QString& deviceId)
 void LanLinkProvider::refreshPairingHandler(const QString& deviceId) {
     LanPairingHandler* ph = mPairingHandlers.value(deviceId);
     if (ph) {
-        ph->setDeviceLink(mLinks[deviceId]);
-
+        DeviceLink* link = mLinks[deviceId];
+        ph->setDeviceLink(link);
+        connect(ph, &LanPairingHandler::pairingError, link, &DeviceLink::pairingError);
     }
 }
diff --git a/core/device.cpp b/core/device.cpp
index b99ccef..afeff20 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -271,8 +271,8 @@ void Device::addLink(const NetworkPackage& identityPackage, DeviceLink* link)
         }
     }
 
-    connect(link, SIGNAL(pairStatusChanged(PairStatus)), this, SLOT(pairStatusChanged(PairStatus, PairStatus)));
-    connect(link, SIGNAL(pairingFailed(const QString&)), this, SIGNAL(pairingFailed(const QString&)));
+    connect(link, &DeviceLink::pairStatusChanged, this, &Device::pairStatusChanged);
+    connect(link, &DeviceLink::pairingError, this, &Device::pairingError);
 }
 
 void Device::linkDestroyed(QObject* o)

-- 
kdeconnect packaging