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

The following commit has been merged in the master branch:
commit c9e67f3cf024f99dda2056b5b1ad5e91f1416416
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Aug 13 05:37:36 2013 +0200

    Support for X-KDE-PluginInfo-EnabledByDefault
---
 daemon/device.cpp                           | 3 ++-
 daemon/plugins/ping/kdeconnect_ping.desktop | 1 +
 daemon/plugins/ping/pingplugin.cpp          | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/daemon/device.cpp b/daemon/device.cpp
index 5d36191..dfcef41 100644
--- a/daemon/device.cpp
+++ b/daemon/device.cpp
@@ -76,7 +76,8 @@ void Device::reloadPlugins()
     foreach (const QString& pluginName, loader->getPluginList()) {
 
         const QString value = pluginStates.value(pluginName + QString::fromLatin1("Enabled"), QString());
-        bool enabled = (value.isNull() ? true : QVariant(value).toBool()); //Enable all plugins by default
+        KPluginInfo plugininfo(pluginName);
+        bool enabled = (value.isNull() ? plugininfo.isPluginEnabledByDefault() : QVariant(value).toBool());
 
         qDebug() << pluginName << "enabled:" << enabled;
 
diff --git a/daemon/plugins/ping/kdeconnect_ping.desktop b/daemon/plugins/ping/kdeconnect_ping.desktop
index 4fbe2a1..dfae169 100644
--- a/daemon/plugins/ping/kdeconnect_ping.desktop
+++ b/daemon/plugins/ping/kdeconnect_ping.desktop
@@ -9,5 +9,6 @@ X-KDE-PluginInfo-Name=kdeconnect_ping
 X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-Website=http://albertvaka.wordpress.com
 X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
 Name=Ping
 Comment=Send and receive pings
diff --git a/daemon/plugins/ping/pingplugin.cpp b/daemon/plugins/ping/pingplugin.cpp
index 4288bb4..2532ede 100644
--- a/daemon/plugins/ping/pingplugin.cpp
+++ b/daemon/plugins/ping/pingplugin.cpp
@@ -30,7 +30,7 @@ K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_ping", "kdeconnect_ping") )
 PingPlugin::PingPlugin(QObject* parent, const QVariantList& args)
     : KdeConnectPlugin(parent, args)
 {
-    qDebug() << "Plugin constructor for device" << device()->name();
+    qDebug() << "Ping plugin constructor for device" << device()->name();
 }
 
 bool PingPlugin::receivePackage(const NetworkPackage& np)

-- 
kdeconnect packaging