[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=813c9fe

The following commit has been merged in the master branch:
commit 813c9fedb3857a4ff10685fb6f151c705faf9140
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Dec 17 04:41:53 2015 -0800

    Calling setDeviceLink in pairing handler is not required anymore
    
    Since we re-use the same device link object forever now
---
 core/backends/lan/lanlinkprovider.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index e574775..73f643f 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -449,8 +449,6 @@ void LanLinkProvider::addLink(const QString& deviceId, QSslSocket* socket, Netwo
         mLinks[deviceId] = deviceLink;
     }
 
-
-    refreshPairingHandler(deviceId);
     Q_EMIT onConnectionReceived(*receivedPackage, deviceLink);
 
 }
@@ -461,20 +459,11 @@ void LanLinkProvider::userRequestsPair(const QString& deviceId)
     if (!ph) {
         ph = new LanPairingHandler(deviceId);
         mPairingHandlers[deviceId] = ph;
-        refreshPairingHandler(deviceId);
     }
 
     ph->requestPairing();
 }
 
-void LanLinkProvider::refreshPairingHandler(const QString& deviceId) {
-    LanPairingHandler* ph = mPairingHandlers.value(deviceId);
-    if (ph) {
-        DeviceLink* link = mLinks[deviceId];
-        ph->setDeviceLink(link);
-        connect(ph, &LanPairingHandler::pairingError, link, &DeviceLink::pairingError);
-    }
-}
 void LanLinkProvider::incomingPairPackage(DeviceLink* deviceLink, const NetworkPackage& np)
 {
     const QString deviceId = deviceLink->deviceId();
@@ -482,7 +471,6 @@ void LanLinkProvider::incomingPairPackage(DeviceLink* deviceLink, const NetworkP
     if (!ph) {
         ph = new LanPairingHandler(deviceId);
         mPairingHandlers[deviceId] = ph;
-        refreshPairingHandler(deviceId);
     }
 
     ph->packageReceived(np);

-- 
kdeconnect packaging