[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=8a019cc

The following commit has been merged in the master branch:
commit 8a019ccddff6eda74f1bfb79d42b3606123754f4
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Dec 17 17:58:33 2015 +0100

    Fix assert
---
 CMakeLists.txt                      | 4 ++--
 core/backends/lan/landevicelink.cpp | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ff2be3..8e0ec83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,8 @@ find_package(Qt5 5.2 REQUIRED COMPONENTS Quick)
 find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons)
 find_package(KF5DocTools)
 find_package(Qca-qt5 2.1.0 REQUIRED)
-find_package(TelepathyQt5 0.9.5)
-find_package(TelepathyQt5Service 0.9.7)
+# find_package(TelepathyQt5 0.9.5)
+# find_package(TelepathyQt5Service 0.9.7)
 if (TelepathyQt5_FOUND AND TelepathyQt5Service_FOUND)
     add_definitions(-DHAVE_TELEPATHY)
 endif()
diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index bdc6e42..d8fe147 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -134,12 +134,11 @@ void LanDeviceLink::userRequestsUnpair()
 
 void LanDeviceLink::setPairStatus(PairStatus status)
 {
+    DeviceLink::setPairStatus(status);
     if (status == Paired) {
         Q_ASSERT(KdeConnectConfig::instance()->trustedDevices().contains(deviceId()));
         Q_ASSERT(!mSocketLineReader->peerCertificate().isNull());
         KdeConnectConfig::instance()->setDeviceProperty(deviceId(), "certificate", mSocketLineReader->peerCertificate().toPem());
     }
-
-    DeviceLink::setPairStatus(status);
 }
 

-- 
kdeconnect packaging