[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=174cf3d

The following commit has been merged in the master branch:
commit 174cf3d3ce3d10fdaf7ce1379a889a51bc47b2d6
Author: David Kahles <david.kahles96 at gmail.com>
Date:   Tue Apr 12 02:34:23 2016 +0200

    Don't reset m_pairStatus when unpair is requested by remote device
    
    unpairInternal() will take care of this, otherwise pairingChanged() will not
    be emited and though, the model won't notice it.
    
    REVIEW: 127641
---
 core/device.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index 816b37a..e4d584e 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -395,13 +395,11 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
 
             qCDebug(KDECONNECT_CORE) << "Unpair request";
 
-            PairStatus prevPairStatus = m_pairStatus;
-            m_pairStatus = Device::NotPaired;
-
-            if (prevPairStatus == Device::Requested) {
+            if (m_pairStatus == Device::Requested) {
                 m_pairingTimeut.stop();
+                m_pairStatus = Device::NotPaired;
                 Q_EMIT pairingFailed(i18n("Canceled by other peer"));
-            } else if (prevPairStatus == Device::Paired) {
+            } else if (m_pairStatus == Device::Paired) {
                 unpairInternal();
             }
 

-- 
kdeconnect packaging