[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=654ee39

The following commit has been merged in the master branch:
commit 654ee39b377fff3794663ebaab1f9edc8df5b1e3
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sun Mar 15 19:19:29 2015 -0700

    Fixed bug when pairing fails if initiated by the desktop
    
    If the phone thinks that it's already paired with the computer when
    receiving a pairing request, it will answer stuff back that will cause
    the desktop to abort the pairing process.
---
 core/device.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index 0c41ee1..0845c45 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -391,9 +391,7 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
         }
     } else {
         qCDebug(KDECONNECT_CORE) << "device" << name() << "not paired, ignoring package" << np.type();
-
-        //FIXME: Uncommenting this fixes a bug where trying to pair from kde does not work, but I want to investigate the root cause of the bug first (01/03/15)
-        //if (m_pairStatus != Device::Requested)
+        if (m_pairStatus != Device::Requested)
             unpair();
     }
 

-- 
kdeconnect packaging