[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=09557b8

The following commit has been merged in the master branch:
commit 09557b8a1447c58a71416c950c9387267b8ac4f5
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sun Jun 14 13:29:00 2015 -0700

    Moved network change detection from daemon to lanlink
---
 core/backends/lan/lanlinkprovider.cpp | 12 +++++++++++-
 core/daemon.cpp                       | 11 -----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 123ccfa..a491c85 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -30,6 +30,8 @@
 #include <QTcpServer>
 #include <QUdpSocket>
 #include <QtGlobal>
+#include <QNetworkSession>
+#include <QNetworkConfigurationManager>
 
 #include "landevicelink.h"
 #include <kdeconnectconfig.h>
@@ -44,6 +46,14 @@ LanLinkProvider::LanLinkProvider()
     mTcpServer = new QTcpServer(this);
     connect(mTcpServer,SIGNAL(newConnection()),this, SLOT(newConnection()));
 
+    //Detect when a network interface changes status, so we announce ourelves in the new network
+    QNetworkConfigurationManager* networkManager;
+    networkManager = new QNetworkConfigurationManager(this);
+    connect(networkManager, &QNetworkConfigurationManager::configurationChanged, [this, networkManager](QNetworkConfiguration config) {
+        //qCDebug(KDECONNECT_CORE) << config.name() << " state changed to " << config.state();
+        //qCDebug(KDECONNECT_CORE) << "Online status: " << (networkManager->isOnline()? "online":"offline");
+        onNetworkChange();
+    });
 }
 
 LanLinkProvider::~LanLinkProvider()
@@ -84,7 +94,7 @@ void LanLinkProvider::onNetworkChange()
 
     Q_ASSERT(mTcpPort != 0);
 
-    qCDebug(KDECONNECT_CORE()) << "Sending identity packet";
+    qCDebug(KDECONNECT_CORE()) << "Broadcasting identity packet";
     NetworkPackage np("");
     NetworkPackage::createIdentityPackage(&np);
     np.set("tcpPort", mTcpPort);
diff --git a/core/daemon.cpp b/core/daemon.cpp
index 683427f..40d7988 100644
--- a/core/daemon.cpp
+++ b/core/daemon.cpp
@@ -21,8 +21,6 @@
 #include "daemon.h"
 
 #include <QDBusConnection>
-#include <QNetworkSession>
-#include <QNetworkConfigurationManager>
 #include <QNetworkAccessManager>
 #include <QDebug>
 #include <QPointer>
@@ -84,15 +82,6 @@ Daemon::Daemon(QObject *parent)
     }
     setDiscoveryEnabled(true);
 
-    //Detect when a network interface changes status (TODO: Move to the lan link provider?)
-    QNetworkConfigurationManager* networkManager;
-    networkManager = new QNetworkConfigurationManager(this);
-    connect(networkManager, &QNetworkConfigurationManager::configurationChanged, [this, networkManager](QNetworkConfiguration config) {
-        qCDebug(KDECONNECT_CORE()) << config.name() << " state changed to " << config.state();
-        qCDebug(KDECONNECT_CORE()) << "Online status: " << (networkManager->isOnline()? "online":"offline");
-        forceOnNetworkChange();
-    });
-
     //Register on DBus
     QDBusConnection::sessionBus().registerService("org.kde.kdeconnect");
     QDBusConnection::sessionBus().registerObject("/modules/kdeconnect", this, QDBusConnection::ExportScriptableContents);

-- 
kdeconnect packaging