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

The following commit has been merged in the master branch:
commit a4c8934ee71be4ff75a880e3135572acc423f8f1
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sun Jun 14 19:22:13 2015 -0700

    If both devices request pairing at the same time, we just pair.
    
    The second device accepts the request instead of failing.
---
 core/device.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index a7f64cf..3eedbd0 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -193,12 +193,17 @@ void Device::requestPair()
         case Device::Requested:
             Q_EMIT pairingFailed(i18n("Pairing already requested for this device"));
             return;
-        default:
-            if (!isReachable()) {
-                Q_EMIT pairingFailed(i18n("Device not reachable"));
-                return;
-            }
-            break;
+        case Device::RequestedByPeer:
+            qCDebug(KDECONNECT_CORE) << "Pairing already started by the other end, accepting their request.";
+            acceptPairing();
+            return;
+        case Device::NotPaired:
+            ;
+    }
+
+    if (!isReachable()) {
+        Q_EMIT pairingFailed(i18n("Device not reachable"));
+        return;
     }
 
     m_pairStatus = Device::Requested;

-- 
kdeconnect packaging