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

The following commit has been merged in the master branch:
commit dfbe7c7bfc6b56662c3b76fcddecf1f11a977da9
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Mon Aug 11 18:55:38 2014 +0200

    Trying to fix daemon not detecting connection to phone via usb tethering
    
    Probably it was not detecting connections to a wired interface either,
    this should do the trick but it's a bit weird having to connect to
    QNetworkConfigurationManager::configurationAdded() to know about that.
---
 core/daemon.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/core/daemon.cpp b/core/daemon.cpp
index ac8901b..3f917d9 100644
--- a/core/daemon.cpp
+++ b/core/daemon.cpp
@@ -27,6 +27,7 @@
 #include <QNetworkSession>
 #include <QNetworkConfigurationManager>
 #include <QtCrypto>
+#include <QNetworkAccessManager>
 
 #include <KConfig>
 #include <KConfigGroup>
@@ -117,6 +118,9 @@ Daemon::Daemon(QObject *parent)
         kWarning(debugArea()) << "Error: KDE Connect detects wrong permissions for private file " << config->group("myself").readEntry("privateKeyPath");
     }
 
+    //Register on DBus
+    QDBusConnection::sessionBus().registerService("org.kde.kdeconnect");
+    QDBusConnection::sessionBus().registerObject("/modules/kdeconnect", this, QDBusConnection::ExportScriptableContents);
 
     //Load backends (hardcoded by now, should be plugins in a future)
     d->mLinkProviders.insert(new LanLinkProvider());
@@ -132,21 +136,24 @@ Daemon::Daemon(QObject *parent)
         d->mDevices[id] = device;
         Q_EMIT deviceAdded(id);
     }
-    
-    //Listen to connectivity changes
-    QNetworkSession* network = new QNetworkSession(QNetworkConfigurationManager().defaultConfiguration());
+
+    //Listen to new devices
     Q_FOREACH (LinkProvider* a, d->mLinkProviders) {
-        connect(network, SIGNAL(stateChanged(QNetworkSession::State)),
-                a, SLOT(onNetworkChange(QNetworkSession::State)));
         connect(a, SIGNAL(onConnectionReceived(NetworkPackage, DeviceLink*)),
                 this, SLOT(onNewDeviceLink(NetworkPackage, DeviceLink*)));
     }
-
-    QDBusConnection::sessionBus().registerService("org.kde.kdeconnect");
-    QDBusConnection::sessionBus().registerObject("/modules/kdeconnect", this, QDBusConnection::ExportScriptableContents);
-
     setDiscoveryEnabled(true);
 
+    //Listen to connectivity changes
+    QNetworkConfigurationManager* manager = new QNetworkConfigurationManager();
+    QNetworkSession* network = new QNetworkSession(manager->defaultConfiguration());
+    connect(manager, SIGNAL(configurationAdded(QNetworkConfiguration)),
+            this, SLOT(forceOnNetworkChange()));
+    Q_FOREACH (LinkProvider* a, d->mLinkProviders) {
+        connect(network, SIGNAL(stateChanged(QNetworkSession::State)),
+                a, SLOT(onNetworkChange(QNetworkSession::State)));
+    }
+
     kDebug(debugArea()) << "KdeConnect daemon started";
 }
 

-- 
kdeconnect packaging