[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=4c195e1

The following commit has been merged in the master branch:
commit 4c195e1a16c8acdef13b1746194a9b56ec7c86eb
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sat Mar 14 00:39:13 2015 +0100

    No need to set up the timeout every time
---
 core/device.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index 67030ff..fcd13b6 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -56,7 +56,12 @@ Device::Device(QObject* parent, const QString& id)
     m_deviceName = info.deviceName;
     m_deviceType = str2type(info.deviceType);
     m_publicKey = QCA::RSAPublicKey::fromPEM(info.publicKey);
-    
+
+    m_pairingTimeut.setSingleShot(true);
+    m_pairingTimeut.setInterval(30 * 1000);  //30 seconds of timeout
+    connect(&m_pairingTimeut, SIGNAL(timeout()),
+            this, SLOT(pairingTimeout()));
+
     //Register in bus
     QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
 }
@@ -202,11 +207,7 @@ void Device::requestPair()
         return;
     }
 
-    m_pairingTimeut.setSingleShot(true);
-    m_pairingTimeut.start(30 * 1000); //30 seconds of timeout
-    connect(&m_pairingTimeut, SIGNAL(timeout()),
-            this, SLOT(pairingTimeout()));
-
+    m_pairingTimeut.start();
 }
 
 void Device::unpair()

-- 
kdeconnect packaging