[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=8627c8d

The following commit has been merged in the master branch:
commit 8627c8da511aca2b29e0de5b4a1389397faac3a8
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Aug 20 13:52:25 2013 +0200

    Added a getter for dbus path in Device
---
 daemon/device.cpp                        | 4 ++--
 daemon/device.h                          | 1 +
 daemon/plugins/battery/batteryplugin.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/daemon/device.cpp b/daemon/device.cpp
index f4bb1b4..deb68ec 100644
--- a/daemon/device.cpp
+++ b/daemon/device.cpp
@@ -27,7 +27,7 @@ Device::Device(const QString& id, const QString& name)
     reloadPlugins();
 
     //Register in bus
-    QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/devices/"+id, this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
+    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
 
 }
 
@@ -44,7 +44,7 @@ Device::Device(const QString& id, const QString& name, DeviceLink* link)
     reloadPlugins();
 
     //Register in bus
-    QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/devices/"+id, this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
+    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
 
 }
 
diff --git a/daemon/device.h b/daemon/device.h
index d22d0bd..98754b7 100644
--- a/daemon/device.h
+++ b/daemon/device.h
@@ -50,6 +50,7 @@ public:
 
     QString id() const { return m_deviceId; }
     QString name() const { return m_deviceName; }
+    QString dbusPath() const { return "/modules/kdeconnect/devices/"+id(); }
 
     //Add and remove links
     void addLink(DeviceLink*);
diff --git a/daemon/plugins/battery/batteryplugin.cpp b/daemon/plugins/battery/batteryplugin.cpp
index b5a177a..1a61c77 100644
--- a/daemon/plugins/battery/batteryplugin.cpp
+++ b/daemon/plugins/battery/batteryplugin.cpp
@@ -43,7 +43,7 @@ BatteryPlugin::BatteryPlugin(QObject *parent, const QVariantList &args)
 BatteryPlugin::~BatteryPlugin()
 {
     //FIXME: Qt dbus does not allow to remove an adaptor! (it causes a crash in
-    // the next access to device via dbus). The implication of not deleting this
+    // the next dbus access to its parent). The implication of not deleting this
     // is that disabling the plugin does not remove the interface (that will
     // return outdated values) and that enabling it again instantiates a second
     // adaptor. This is a partial memory leak (the memory will be freed when the

-- 
kdeconnect packaging