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

The following commit has been merged in the master branch:
commit e6402f7e97796a8a17a45bc6e3b85799330005a0
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sun Jun 14 18:59:53 2015 -0700

    We were not clearing notifications when a device disconnected
---
 plugins/notifications/notificationsdbusinterface.cpp | 5 +++++
 plugins/notifications/notificationsdbusinterface.h   | 1 +
 plugins/notifications/notificationsplugin.cpp        | 3 +--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/notifications/notificationsdbusinterface.cpp b/plugins/notifications/notificationsdbusinterface.cpp
index 26323ae..66d6790 100644
--- a/plugins/notifications/notificationsdbusinterface.cpp
+++ b/plugins/notifications/notificationsdbusinterface.cpp
@@ -46,6 +46,11 @@ NotificationsDbusInterface::NotificationsDbusInterface(KdeConnectPlugin* plugin)
 
 NotificationsDbusInterface::~NotificationsDbusInterface()
 {
+    clearNotifications();
+}
+
+void NotificationsDbusInterface::clearNotifications()
+{
     qDeleteAll(mNotifications);
 }
 
diff --git a/plugins/notifications/notificationsdbusinterface.h b/plugins/notifications/notificationsdbusinterface.h
index 5c1244e..e8d5c2a 100644
--- a/plugins/notifications/notificationsdbusinterface.h
+++ b/plugins/notifications/notificationsdbusinterface.h
@@ -43,6 +43,7 @@ public:
     virtual ~NotificationsDbusInterface();
 
     void processPackage(const NetworkPackage& np);
+    void clearNotifications();
 
 public Q_SLOTS:
     Q_SCRIPTABLE QStringList activeNotifications();
diff --git a/plugins/notifications/notificationsplugin.cpp b/plugins/notifications/notificationsplugin.cpp
index 568a052..b0d089c 100644
--- a/plugins/notifications/notificationsplugin.cpp
+++ b/plugins/notifications/notificationsplugin.cpp
@@ -49,9 +49,8 @@ NotificationsPlugin::~NotificationsPlugin()
     // is that disabling the plugin does not remove the interface (that will
     // return outdated values) and that enabling it again instantiates a second
     // adaptor.
-
     //notificationsDbusInterface->deleteLater();
-
+    notificationsDbusInterface->clearNotifications();
 }
 
 bool NotificationsPlugin::receivePackage(const NetworkPackage& np)

-- 
kdeconnect packaging