[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=1ce8750

The following commit has been merged in the master branch:
commit 1ce8750093e763604cb55c947d0288647e3bee68
Author: Samoilenko Yuri <kinnalru at gmail.com>
Date:   Thu Feb 6 18:05:05 2014 +0400

    simple bugfixes
---
 plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp | 3 ---
 plasmoid/declarativeplugin/responsewaiter.h                | 8 ++++----
 plasmoid/package/contents/ui/Battery.qml                   | 6 +++---
 plasmoid/package/contents/ui/Sftp.qml                      | 2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp b/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp
index 9d8970b..4c54459 100644
--- a/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp
+++ b/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp
@@ -31,7 +31,6 @@
 
 #include "libkdeconnect/devicesmodel.h"
 #include "libkdeconnect/notificationsmodel.h"
-#include "batteryinterface.h"
 
 Q_EXPORT_PLUGIN2(kdeconnectdeclarativeplugin, KdeConnectDeclarativePlugin);
 
@@ -61,8 +60,6 @@ void KdeConnectDeclarativePlugin::registerTypes(const char* uri)
     
     qmlRegisterType<DevicesModel>("org.kde.kdeconnect", 1, 0, "DevicesModel");
     qmlRegisterType<NotificationsModel>("org.kde.kdeconnect", 1, 0, "NotificationsModel");
-    qmlRegisterType<BatteryInterface>("org.kde.kdeconnect", 1, 0, "BatteryInterface");
-    
     qmlRegisterType<DBusAsyncResponse>("org.kde.kdeconnect", 1, 0, "DBusAsyncResponse");
 }
 
diff --git a/plasmoid/declarativeplugin/responsewaiter.h b/plasmoid/declarativeplugin/responsewaiter.h
index aaeb9fe..de7a634 100644
--- a/plasmoid/declarativeplugin/responsewaiter.h
+++ b/plasmoid/declarativeplugin/responsewaiter.h
@@ -35,16 +35,16 @@ private:
 class DBusAsyncResponse : public QObject
 {
     Q_OBJECT
-    
-    Q_PROPERTY(QVariant pendingCall WRITE setPendingCall)
-    Q_PROPERTY(bool autoDelete WRITE setAutodelete)
+    Q_PROPERTY(bool autoDelete READ autodelete WRITE setAutodelete)
     
 public:
     DBusAsyncResponse(QObject* parent = 0) : QObject(parent), m_autodelete(false) {}
     virtual ~DBusAsyncResponse() {}; 
 
-    void setPendingCall(QVariant e);
+    Q_INVOKABLE void setPendingCall(QVariant e);
+    
     void setAutodelete(bool b) {m_autodelete = b;};
+    bool autodelete() const {return m_autodelete;}
     
 Q_SIGNALS:
     void success(QVariant result);
diff --git a/plasmoid/package/contents/ui/Battery.qml b/plasmoid/package/contents/ui/Battery.qml
index 8ccf558..531137e 100644
--- a/plasmoid/package/contents/ui/Battery.qml
+++ b/plasmoid/package/contents/ui/Battery.qml
@@ -31,7 +31,7 @@ QtObject {
     property bool available: false
     property bool state: false
     property int charge: -1
-    property string displayString: (state) ? ("Charging, " + charge) : ("Discharging, " + charge)
+    property string displayString: (available) ? ((state) ? ("Charging, " + charge) : ("Discharging, " + charge)) : "No Info"
     
     property variant device: DeviceDbusInterfaceFactory.create(deviceId)
     property variant battery: null
@@ -55,8 +55,8 @@ QtObject {
             battery.stateChanged.connect(function(charging) {root.state = charging})
             battery.chargeChanged.connect(function(charge) {root.charge = charge})
             
-            startupCheck1.pendingCall = battery.isCharging()
-            startupCheck2.pendingCall = battery.charge()
+            startupCheck1.setPendingCall(battery.isCharging())
+            startupCheck2.setPendingCall(battery.charge())
         }
         else {
             battery = null
diff --git a/plasmoid/package/contents/ui/Sftp.qml b/plasmoid/package/contents/ui/Sftp.qml
index aac8c79..6df7140 100644
--- a/plasmoid/package/contents/ui/Sftp.qml
+++ b/plasmoid/package/contents/ui/Sftp.qml
@@ -48,7 +48,7 @@ QtObject {
         sftp.mounted.connect(mounted)
         sftp.unmounted.connect(unmounted)
         
-        startupCheck.pendingCall = sftp.isMounted()
+        startupCheck.setPendingCall(sftp.isMounted())
     }
     
     function browse() {

-- 
kdeconnect packaging