[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=ab8ea93

The following commit has been merged in the master branch:
commit ab8ea938129a36d155eceb3ca9d34efccb9156f6
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Mar 3 04:51:36 2014 +0100

    When uploading a file start reading the file
    
    Otherwise it will wait for ::readyRead() to be called indefinitely.
---
 kded/backends/lan/uploadjob.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/kded/backends/lan/uploadjob.cpp b/kded/backends/lan/uploadjob.cpp
index ae055cb..a5b1215 100644
--- a/kded/backends/lan/uploadjob.cpp
+++ b/kded/backends/lan/uploadjob.cpp
@@ -28,6 +28,9 @@ UploadJob::UploadJob(const QSharedPointer<QIODevice>& source): KJob()
     mInput = source;
     mServer = new QTcpServer(this);
     mSocket = 0;
+
+    connect(mInput.data(), SIGNAL(readyRead()), this, SLOT(readyRead()));
+    connect(mInput.data(), SIGNAL(aboutToClose()), this, SLOT(aboutToClose()));
 }
 
 void UploadJob::start()
@@ -49,15 +52,13 @@ void UploadJob::newConnection()
 
     if (mSocket || !mServer->hasPendingConnections()) return;
 
-    mSocket = mServer->nextPendingConnection();
-
-    connect(mInput.data(), SIGNAL(readyRead()), this, SLOT(readyRead()));
-    connect(mInput.data(), SIGNAL(aboutToClose()), this, SLOT(aboutToClose()));
-
     if (!mInput->open(QIODevice::ReadOnly)) {
+        qWarning() << "error when opening the input to upload";
         return; //TODO: Handle error, clean up...
     }
 
+    mSocket = mServer->nextPendingConnection();
+    readyRead();
 }
 
 void UploadJob::readyRead()
@@ -65,7 +66,10 @@ void UploadJob::readyRead()
     //TODO: Implement payload encryption
 
     qint64 bytes = qMax(mInput->bytesAvailable(), (qint64)4096);
-    mSocket->write(mInput->read(bytes));
+    int w = mSocket->write(mInput->read(bytes));
+    if (w<0) {
+        qWarning() << "error when writing data to upload" << bytes << mInput->bytesAvailable();
+    }
 }
 
 void UploadJob::aboutToClose()

-- 
kdeconnect packaging