[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=2b45109

The following commit has been merged in the master branch:
commit 2b451097eb02716c2d2ca77147cf37f835e911d9
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Jul 4 19:34:28 2016 +0200

    Make sure errors get reported
---
 core/backends/lan/server.cpp    | 7 ++++++-
 core/backends/lan/server.h      | 3 +++
 core/backends/lan/uploadjob.cpp | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/backends/lan/server.cpp b/core/backends/lan/server.cpp
index 5992f89..04b8c48 100644
--- a/core/backends/lan/server.cpp
+++ b/core/backends/lan/server.cpp
@@ -30,7 +30,7 @@
 Server::Server(QObject * parent)
     :QTcpServer(parent)
 {
-
+    connect(this, &QTcpServer::acceptError, this, &Server::errorFound);
 }
 
 void Server::incomingConnection(qintptr socketDescriptor) {
@@ -57,3 +57,8 @@ QSslSocket* Server::nextPendingConnection() {
 bool Server::hasPendingConnections() const {
     return !pendingConnections.isEmpty();
 }
+
+void Server::errorFound(QAbstractSocket::SocketError socketError)
+{
+    qDebug() << "error:" << socketError;
+}
diff --git a/core/backends/lan/server.h b/core/backends/lan/server.h
index aa2371a..977cf82 100644
--- a/core/backends/lan/server.h
+++ b/core/backends/lan/server.h
@@ -45,6 +45,9 @@ public:
 
 protected:
     void incomingConnection(qintptr socketDescriptor) override;
+
+private:
+    void errorFound(QAbstractSocket::SocketError socketError);
 };
 
 #endif //KDECONNECT_SERVER_H
diff --git a/core/backends/lan/uploadjob.cpp b/core/backends/lan/uploadjob.cpp
index 665f200..a2b14a3 100644
--- a/core/backends/lan/uploadjob.cpp
+++ b/core/backends/lan/uploadjob.cpp
@@ -23,6 +23,7 @@
 
 #include <qalgorithms.h>
 #include <QtGlobal>
+#include <KLocalizedString>
 #include <kdeconnectconfig.h>
 
 #include "core_debug.h"
@@ -47,6 +48,8 @@ void UploadJob::start()
         if (mPort > 1764) { //No ports available?
             qCWarning(KDECONNECT_CORE) << "Error opening a port in range 1739-1764 for file transfer";
             mPort = 0;
+            setError(1);
+            setErrorText(i18n("Couldn't find an available port"));
             emitResult();
             return;
         }

-- 
kdeconnect packaging