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

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:28:24 UTC 2016


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

The following commit has been merged in the master branch:
commit a649bb5668c7961b762e3c9977edd35d66dff21b
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sat Mar 21 23:11:50 2015 -0700

    Added some error messages when ports are not available
---
 core/backends/lan/lanlinkprovider.cpp | 5 +++++
 core/backends/lan/uploadjob.cpp       | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index f289e97..a0334ee 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -77,6 +77,11 @@ void LanLinkProvider::onStart()
     mTcpPort = port;
     while (!mTcpServer->listen(QHostAddress::Any, mTcpPort)) {
         mTcpPort++;
+        if (mTcpPort > 1764) { //No ports available?
+            qCritical(KDECONNECT_CORE) << "Error opening a port in range 1714-1764";
+            mTcpPort = 0;
+            return;
+        }
     }
 
     onNetworkChange(QNetworkSession::Connected);
diff --git a/core/backends/lan/uploadjob.cpp b/core/backends/lan/uploadjob.cpp
index 638adad..e46dd4c 100644
--- a/core/backends/lan/uploadjob.cpp
+++ b/core/backends/lan/uploadjob.cpp
@@ -36,10 +36,10 @@ UploadJob::UploadJob(const QSharedPointer<QIODevice>& source): KJob()
 void UploadJob::start()
 {
     mPort = 1739;
-    while(!mServer->listen(QHostAddress::Any, mPort)) {
+    while (!mServer->listen(QHostAddress::Any, mPort)) {
         mPort++;
         if (mPort > 1764) { //No ports available?
-            qCDebug(KDECONNECT_CORE) << "Error opening a port in range 1739-1764 for file transfer";
+            qWarning(KDECONNECT_CORE) << "Error opening a port in range 1739-1764 for file transfer";
             mPort = 0;
             return;
         }

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list