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

The following commit has been merged in the master branch:
commit 87513455755c6d9ae19200717f88224caa257b13
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Jul 23 20:22:38 2013 +0200

    Some bugs fixed and sockets keepalive enabled
---
 daemon/announcers/avahitcpannouncer.cpp                | 3 ++-
 daemon/networkpackage.cpp                              | 9 +++++----
 daemon/packageinterfaces/clipboardpackageinterface.cpp | 3 +--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/daemon/announcers/avahitcpannouncer.cpp b/daemon/announcers/avahitcpannouncer.cpp
index 4f329c9..dcb9f45 100644
--- a/daemon/announcers/avahitcpannouncer.cpp
+++ b/daemon/announcers/avahitcpannouncer.cpp
@@ -34,7 +34,7 @@ AvahiTcpAnnouncer::AvahiTcpAnnouncer()
 
     service = new DNSSD::PublicService(QHostInfo::localHostName(), serviceType, port);
 
-    mServer = new QTcpServer();
+    mServer = new QTcpServer(this);
     connect(mServer,SIGNAL(newConnection()),this, SLOT(newConnection()));
     mServer->listen(QHostAddress::Any, port);
 
@@ -45,6 +45,7 @@ void AvahiTcpAnnouncer::newConnection()
     qDebug() << "AvahiTcpAnnouncer newConnection";
 
     QTcpSocket* socket = mServer->nextPendingConnection();
+    socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
 
     connect(socket,SIGNAL(readyRead()),this,SLOT(dataReceived()));
 
diff --git a/daemon/networkpackage.cpp b/daemon/networkpackage.cpp
index 82ce22d..c43cd26 100644
--- a/daemon/networkpackage.cpp
+++ b/daemon/networkpackage.cpp
@@ -71,10 +71,6 @@ void NetworkPackage::unserialize(QByteArray a, NetworkPackage* np)
         np->setVersion(-1);
     }
 
-    if (np->version() > CURRENT_PACKAGE_VERSION) {
-        qDebug() << "Warning: package version " << np->version() << " greater than supported version " << CURRENT_PACKAGE_VERSION;
-    }
-
     //QVariant -> Object
     //NetworkPackage np;
     //QJSon json(a);
@@ -82,6 +78,11 @@ void NetworkPackage::unserialize(QByteArray a, NetworkPackage* np)
     //np.mType = json["type"];
     //np.mBody = json["body"];
     QJson::QObjectHelper::qvariant2qobject(variant,np);
+
+    if (np->version() > CURRENT_PACKAGE_VERSION) {
+        qDebug() << "Warning: package version " << np->version() << " greater than supported version " << CURRENT_PACKAGE_VERSION;
+    }
+
 }
 
 void NetworkPackage::createIdentityPackage(NetworkPackage* np)
diff --git a/daemon/packageinterfaces/clipboardpackageinterface.cpp b/daemon/packageinterfaces/clipboardpackageinterface.cpp
index b310270..d63f926 100644
--- a/daemon/packageinterfaces/clipboardpackageinterface.cpp
+++ b/daemon/packageinterfaces/clipboardpackageinterface.cpp
@@ -25,7 +25,6 @@
 #include <QApplication>
 
 ClipboardPackageInterface::ClipboardPackageInterface() {
-    qDebug() << "ClipboardPackageInterface";
     clipboard = QApplication::clipboard();
     ignore_next_clipboard_change = false;
     connect(clipboard,SIGNAL(changed(QClipboard::Mode)),this,SLOT(clipboardChanged()));
@@ -37,7 +36,7 @@ void ClipboardPackageInterface::clipboardChanged()
         ignore_next_clipboard_change = false;
         return;
     }
-    qDebug() << "ClipboardChanged";
+    //qDebug() << "ClipboardChanged";
     NetworkPackage np(PACKAGE_TYPE_CLIPBOARD);
     np.set("content",clipboard->text());
     emit sendPackage(np);

-- 
kdeconnect packaging