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

The following commit has been merged in the master branch:
commit e1be5319f53a41147c7c5523ca3dac8dd13a69e8
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Sep 8 09:05:06 2015 +0200

    Only broadcast again if the network configuration actually changes
    
    Reviewed Albert Vaca
---
 core/backends/lan/lanlinkprovider.cpp | 16 +++++++++-------
 core/backends/lan/lanlinkprovider.h   |  2 ++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 2555668..85a1904 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -47,14 +47,16 @@ LanLinkProvider::LanLinkProvider()
     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) {
-        Q_UNUSED(config);
-        //qCDebug(KDECONNECT_CORE) << config.name() << " state changed to " << config.state();
-        //qCDebug(KDECONNECT_CORE) << "Online status: " << (networkManager->isOnline()? "online":"offline");
+    QNetworkConfigurationManager* networkManager = new QNetworkConfigurationManager(this);
+    connect(networkManager, &QNetworkConfigurationManager::configurationChanged, this, &LanLinkProvider::onNetworkConfigurationChanged);
+}
+
+void LanLinkProvider::onNetworkConfigurationChanged(const QNetworkConfiguration &config)
+{
+    if (m_lastConfig != config) {
+        m_lastConfig = config;
         onNetworkChange();
-    });
+    }
 }
 
 LanLinkProvider::~LanLinkProvider()
diff --git a/core/backends/lan/lanlinkprovider.h b/core/backends/lan/lanlinkprovider.h
index b379434..c754f8a 100644
--- a/core/backends/lan/lanlinkprovider.h
+++ b/core/backends/lan/lanlinkprovider.h
@@ -52,6 +52,7 @@ private Q_SLOTS:
     void newConnection();
     void dataReceived();
     void deviceLinkDestroyed(QObject* destroyedDeviceLink);
+    void onNetworkConfigurationChanged(const QNetworkConfiguration &config);
 
 private:
     static void configureSocket(QTcpSocket* socket);
@@ -69,6 +70,7 @@ private:
         QHostAddress sender;
     };
     QMap<QTcpSocket*, PendingConnect> receivedIdentityPackages;
+    QNetworkConfiguration m_lastConfig;
 
 };
 

-- 
kdeconnect packaging