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

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:27:33 UTC 2016


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

The following commit has been merged in the master branch:
commit 4a74f413ae209594fc754de44c6cc64491854bed
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Mon Apr 14 21:47:31 2014 +0200

    Accept all connections until none are available
    
    When newConnection is called pendingConnections may have more than
    one connectio, so we have to iterate and use all of them.
---
 kded/backends/lan/lanlinkprovider.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kded/backends/lan/lanlinkprovider.cpp b/kded/backends/lan/lanlinkprovider.cpp
index cd4f2d5..36c3bc4 100644
--- a/kded/backends/lan/lanlinkprovider.cpp
+++ b/kded/backends/lan/lanlinkprovider.cpp
@@ -222,10 +222,12 @@ void LanLinkProvider::newConnection()
 {
     //kDebug(kdeconnect_kded()) << "LanLinkProvider newConnection";
 
-    QTcpSocket* socket = mTcpServer->nextPendingConnection();
-    socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
+    while(mTcpServer->hasPendingConnections()) {
+        QTcpSocket* socket = mTcpServer->nextPendingConnection();
+        socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
 
-    connect(socket,SIGNAL(readyRead()),this,SLOT(dataReceived()));
+        connect(socket, SIGNAL(readyRead()), this, SLOT(dataReceived()));
+    }
 
 /*
     NetworkPackage np(PACKAGE_TYPE_IDENTITY);

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list