[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:29:46 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=1c315af

The following commit has been merged in the master branch:
commit 1c315af108517580a4488d06cc94764fb268c81d
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Jun 7 00:28:52 2016 +0200

    Revert "Fix file transfers"
    
    This reverts commit 252ea4ba20e909ec5530878124fba23003ce8d46.
---
 core/backends/lan/downloadjob.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/backends/lan/downloadjob.cpp b/core/backends/lan/downloadjob.cpp
index 080d427..921d0b4 100644
--- a/core/backends/lan/downloadjob.cpp
+++ b/core/backends/lan/downloadjob.cpp
@@ -58,13 +58,11 @@ void DownloadJob::start()
     connect(mSocket.data(), SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(done()));
     //connect(mSocket.data(), &QAbstractSocket::connected, [=](){ qDebug() << "Connected"; });
 
-    mSocket->connectToHost(mAddress.toString(), mPort);
-    mSocket->waitForConnected();
-//    mSocket->connectToHost(mAddress, mPort, QIODevice::ReadOnly);
-//    mSocket->waitForConnected();
+    // Cannot use read only, might be due to ssl handshake, getting QIODevice::ReadOnly error and no connection
+    mSocket->connectToHostEncrypted(mAddress.toString(), mPort, QIODevice::ReadWrite);
+    mSocket->waitForEncrypted();
 
     //mSocket->open(QIODevice::ReadOnly);
-
 }
 
 void DownloadJob::done()

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list