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

The following commit has been merged in the master branch:
commit ebd429629ab7e78cf37e1331a046f83391146b3d
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Wed Mar 2 16:17:38 2016 -0800

    Fixed unpairs never being sent
---
 core/backends/lan/landevicelink.cpp   | 2 +-
 core/backends/lan/lanlinkprovider.cpp | 6 ++++++
 core/backends/lan/lanlinkprovider.h   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index a0542f3..50c8dcb 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -135,7 +135,7 @@ void LanDeviceLink::userRequestsPair()
 
 void LanDeviceLink::userRequestsUnpair()
 {
-    setPairStatus(NotPaired);
+    qobject_cast<LanLinkProvider*>(provider())->userRequestsUnpair(deviceId());
 }
 
 void LanDeviceLink::setPairStatus(PairStatus status)
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index e513e07..9389f89 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -475,6 +475,12 @@ void LanLinkProvider::userRequestsPair(const QString& deviceId)
     ph->requestPairing();
 }
 
+void LanLinkProvider::userRequestsUnpair(const QString& deviceId)
+{
+    LanPairingHandler* ph = createPairingHandler(mLinks.value(deviceId));
+    ph->unpair();
+}
+
 void LanLinkProvider::incomingPairPackage(DeviceLink* deviceLink, const NetworkPackage& np)
 {
     LanPairingHandler* ph = createPairingHandler(deviceLink);
diff --git a/core/backends/lan/lanlinkprovider.h b/core/backends/lan/lanlinkprovider.h
index fbb37a1..d08d3d6 100644
--- a/core/backends/lan/lanlinkprovider.h
+++ b/core/backends/lan/lanlinkprovider.h
@@ -45,6 +45,7 @@ public:
     int priority() override { return PRIORITY_HIGH; }
 
     void userRequestsPair(const QString &deviceId);
+    void userRequestsUnpair(const QString &deviceId);
     void incomingPairPackage(DeviceLink* device, const NetworkPackage& np);
 
 public Q_SLOTS:

-- 
kdeconnect packaging