[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=9c73658

The following commit has been merged in the master branch:
commit 9c736583e23aba295f53f52975a99ae873e8700c
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Jul 5 12:42:39 2016 +0200

    Use the actual connection origin, so we don't keep all connections open.
---
 core/backends/lan/lanlinkprovider.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index da7e804..7630f0c 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -269,14 +269,16 @@ void LanLinkProvider::encrypted()
     disconnect(socket, SIGNAL(encrypted()), this, SLOT(encrypted()));
     disconnect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(sslErrors(QList<QSslError>)));
 
+    Q_ASSERT(socket->mode() != QSslSocket::UnencryptedMode);
+    LanDeviceLink::ConnectionStarted connectionOrigin = (socket->mode() == QSslSocket::SslClientMode)? LanDeviceLink::Locally : LanDeviceLink::Remotely;
+
     NetworkPackage* receivedPackage = receivedIdentityPackages[socket].np;
     const QString& deviceId = receivedPackage->get<QString>("deviceId");
 
-    addLink(deviceId, socket, receivedPackage, LanDeviceLink::Remotely);
+    addLink(deviceId, socket, receivedPackage, connectionOrigin);
 
     // Copied from connected slot, now delete received package
     delete receivedIdentityPackages.take(socket).np;
-
 }
 
 void LanLinkProvider::sslErrors(const QList<QSslError>& errors)

-- 
kdeconnect packaging