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

The following commit has been merged in the master branch:
commit f194ab9a5236986b68a38c216ae9e61493ac1f03
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Fri Aug 16 01:01:58 2013 +0200

    Plugins are not loaded until a device is reachable
---
 daemon/device.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/daemon/device.cpp b/daemon/device.cpp
index 32ee926..e349b03 100644
--- a/daemon/device.cpp
+++ b/daemon/device.cpp
@@ -70,7 +70,7 @@ void Device::reloadPlugins()
 {
     QMap< QString, KdeConnectPlugin* > newPluginMap;
 
-    if (paired()) { //Do not load any plugin for unpaired devices
+    if (paired() && reachable()) { //Do not load any plugin for unpaired devices, nor useless loading them for unreachable devices
 
         QString path = KStandardDirs().resourceDirs("config").first()+"kdeconnect/";
         QMap<QString,QString> pluginStates = KSharedConfig::openConfig(path + id())->group("Plugins").entryMap();
@@ -150,6 +150,7 @@ void Device::addLink(DeviceLink* link)
     qSort(m_deviceLinks.begin(),m_deviceLinks.end(),lessThan);
 
     if (m_deviceLinks.size() == 1) {
+        reloadPlugins();
         Q_EMIT reachableStatusChanged();
     }
 
@@ -167,6 +168,7 @@ void Device::removeLink(DeviceLink* link)
     qDebug() << "RemoveLink"<< m_deviceLinks.size() << "links remaining";
 
     if (m_deviceLinks.empty()) {
+        reloadPlugins();
         Q_EMIT reachableStatusChanged();
     }
 }

-- 
kdeconnect packaging