[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=73a80f0

The following commit has been merged in the master branch:
commit 73a80f02969a1e899de3e50023e5fc67f89a357b
Author: Vineet Garg <grgvineet at gmail.com>
Date:   Sun Sep 13 01:45:19 2015 +0530

    Fixed Lan Link Provider Test
    Pairing timer was started even when pair package sending is failed, fixed that
---
 core/backends/lan/lanpairinghandler.cpp | 6 ++++--
 tests/lanlinkprovidertest.cpp           | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/backends/lan/lanpairinghandler.cpp b/core/backends/lan/lanpairinghandler.cpp
index 27c06be..86bdf42 100644
--- a/core/backends/lan/lanpairinghandler.cpp
+++ b/core/backends/lan/lanpairinghandler.cpp
@@ -145,8 +145,10 @@ bool LanPairingHandler::requestPairing()
     createPairPackage(np);
     bool success;
     success = m_deviceLink->sendPackage(np);
-    if (success) m_pairStatus = PairStatus::Requested;
-    m_pairingTimeout.start();
+    if (success) {
+        m_pairStatus = PairStatus::Requested;
+        m_pairingTimeout.start();
+    }
     return success;
 }
 
diff --git a/tests/lanlinkprovidertest.cpp b/tests/lanlinkprovidertest.cpp
index a8c7592..10fba97 100644
--- a/tests/lanlinkprovidertest.cpp
+++ b/tests/lanlinkprovidertest.cpp
@@ -181,7 +181,7 @@ void LanLinkProviderTest::pairedDeviceUdpPackageReceived()
     serverSocket->setPeerVerifyMode(QSslSocket::VerifyPeer);
     serverSocket->setPeerVerifyName(kcc->deviceId());
 
-    serverSocket->startServerEncryption(); // Its TCP server. but SSL client
+    serverSocket->startClientEncryption(); // Its TCP server. but SSL client
     QVERIFY(!serverSocket->isEncrypted());
     spy3.wait(2000);
     qDebug() << "xxxxxxxxx" << serverSocket->sslErrors();
@@ -235,7 +235,7 @@ void LanLinkProviderTest::unpairedDeviceTcpPackageReceived()
     setSocketAttributes(&socket);
     socket.setPeerVerifyMode(QSslSocket::QueryPeer);
 
-    socket.startClientEncryption();
+    socket.startServerEncryption();
 
     QVERIFY(spy3.wait());
 

-- 
kdeconnect packaging