[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=781c41d

The following commit has been merged in the master branch:
commit 781c41da5bc539b0f930a7f4961bdab112497c4a
Merge: c90eebd4898904cb2c95af2ccd46051686a12fb3 904c5484e7004727dc36160e4ffdd660f556da63
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Jan 16 12:28:48 2014 +0100

    Merge branch 'master' into filebrowsing
    
    Conflicts:
    	libkdeconnect/dbusinterfaces.cpp

 kded/daemon.cpp                  | 13 ++++---------
 kded/daemon.h                    |  3 +--
 libkdeconnect/dbusinterfaces.cpp | 30 +++++++++++++++++++++++++++++-
 libkdeconnect/dbusinterfaces.h   | 10 +++++-----
 libkdeconnect/devicesmodel.cpp   | 20 +++++++-------------
 5 files changed, 46 insertions(+), 30 deletions(-)

diff --cc libkdeconnect/dbusinterfaces.cpp
index 1292a1c,a9013ff..c9b09fd
--- a/libkdeconnect/dbusinterfaces.cpp
+++ b/libkdeconnect/dbusinterfaces.cpp
@@@ -27,34 -27,51 +27,62 @@@ DaemonDbusInterface::DaemonDbusInterfac
  
  }
  
++DaemonDbusInterface::~DaemonDbusInterface()
++{
++
++}
++
  DeviceDbusInterface::DeviceDbusInterface(const QString& id, QObject* parent)
      : OrgKdeKdeconnectDeviceInterface("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+id, QDBusConnection::sessionBus(), parent)
  {
  
  }
  
++DeviceDbusInterface::~DeviceDbusInterface()
++{
++
++}
++
  DeviceBatteryDbusInterface::DeviceBatteryDbusInterface(const QString& id, QObject* parent)
      : OrgKdeKdeconnectDeviceBatteryInterface("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+id, QDBusConnection::sessionBus(), parent)
  {
  
  }
  
 -DeviceNotificationsDbusInterface::DeviceNotificationsDbusInterface(const QString& id, QObject* parent)
 -    : OrgKdeKdeconnectDeviceNotificationsInterface("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+id, QDBusConnection::sessionBus(), parent)
++DeviceBatteryDbusInterface::~DeviceBatteryDbusInterface()
+ {
+ 
+ }
+ 
 -NotificationDbusInterface::NotificationDbusInterface(const QString& deviceId, const QString& notificationId, QObject* parent)
 -    : OrgKdeKdeconnectDeviceNotificationsNotificationInterface("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+deviceId+"/notifications/"+notificationId, QDBusConnection::sessionBus(), parent)
 +DeviceNotificationsDbusInterface::DeviceNotificationsDbusInterface(const QString& id, QObject* parent)
 +    : OrgKdeKdeconnectDeviceNotificationsInterface("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+id, QDBusConnection::sessionBus(), parent)
  {
  
  }
  
 -DaemonDbusInterface::~DaemonDbusInterface()
++DeviceNotificationsDbusInterface::~DeviceNotificationsDbusInterface()
+ {
+ 
+ }
+ 
 -DeviceBatteryDbusInterface::~DeviceBatteryDbusInterface()
 +NotificationDbusInterface::NotificationDbusInterface(const QString& deviceId, const QString& notificationId, QObject* parent)
 +    : OrgKdeKdeconnectDeviceNotificationsNotificationInterface("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+deviceId+"/notifications/"+notificationId, QDBusConnection::sessionBus(), parent)
  {
  
  }
  
 -DeviceDbusInterface::~DeviceDbusInterface()
++NotificationDbusInterface::~NotificationDbusInterface()
+ {
+ 
+ }
+ 
 -DeviceNotificationsDbusInterface::~DeviceNotificationsDbusInterface()
 +SftpDbusInterface::SftpDbusInterface(const QString& id, QObject* parent)
 +    : OrgKdeKdeconnectDeviceSftpInterface("org.kde.kdeconnect", "/modules/kdeconnect/devices/" + id + "/sftp", QDBusConnection::sessionBus(), parent)
  {
  
  }
  
- SftpDbusInterface::~SftpDbusInterface() {}
 -NotificationDbusInterface::~NotificationDbusInterface()
++SftpDbusInterface::~SftpDbusInterface()
+ {
+ 
+ }
diff --cc libkdeconnect/dbusinterfaces.h
index 8de095d,0ab09fa..c5b4905
--- a/libkdeconnect/dbusinterfaces.h
+++ b/libkdeconnect/dbusinterfaces.h
@@@ -76,18 -75,9 +76,18 @@@ class KDECONNECT_EXPORT NotificationDbu
      Q_OBJECT
  public:
      NotificationDbusInterface(const QString& deviceId, const QString& notificationId, QObject* parent = 0);
- 
+     virtual ~NotificationDbusInterface();
  };
  
 +class KDECONNECT_EXPORT SftpDbusInterface
 +    : public OrgKdeKdeconnectDeviceSftpInterface
 +{
 +    Q_OBJECT
 +public:
 +    SftpDbusInterface(const QString& deviceId, QObject* parent = 0);
 +    virtual ~SftpDbusInterface();
 +};
 +
  
  
  #endif // DEVICEINTERFACE_H

-- 
kdeconnect packaging