[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=750bf88

The following commit has been merged in the master branch:
commit 750bf8865bf19d277ba18998214bcda64a2455b7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jul 14 13:59:13 2013 +0000

    Use the persistent notifications on file and tube channels
---
 src/filetransferchannelapprover.cpp | 3 ++-
 src/tubechannelapprover.cpp         | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/filetransferchannelapprover.cpp b/src/filetransferchannelapprover.cpp
index f4ddc40..23da763 100644
--- a/src/filetransferchannelapprover.cpp
+++ b/src/filetransferchannelapprover.cpp
@@ -34,7 +34,7 @@ FileTransferChannelApprover::FileTransferChannelApprover(
     kDebug();
 
     //notification
-    m_notification = new KNotification("incoming_file_transfer");
+    m_notification = new KNotification("incoming_file_transfer", 0, KNotification::Persistent);
     KAboutData aboutData("ktelepathy",0,KLocalizedString(),0);
     m_notification.data()->setComponentData(KComponentData(aboutData));
     m_notification.data()->setTitle(i18n("Incoming file transfer"));
@@ -80,6 +80,7 @@ FileTransferChannelApprover::~FileTransferChannelApprover()
     //destroy the notification
     if (m_notification) {
         m_notification.data()->close();
+        m_notification.data()->deleteLater();
     }
 
     //destroy the tray icon
diff --git a/src/tubechannelapprover.cpp b/src/tubechannelapprover.cpp
index 83978c3..88de44f 100644
--- a/src/tubechannelapprover.cpp
+++ b/src/tubechannelapprover.cpp
@@ -87,6 +87,7 @@ TubeChannelApprover::~TubeChannelApprover()
     //destroy the notification
     if (m_notification) {
         m_notification.data()->close();
+        m_notification.data()->deleteLater();
     }
 
     if (m_notifierItem) {
@@ -97,7 +98,7 @@ TubeChannelApprover::~TubeChannelApprover()
 void TubeChannelApprover::showNotification(const QString& title, const QString& comment, const QString& icon, const Tp::ContactPtr& sender)
 {
     // incoming_file_transfer = defines notification sound & user preferences
-    m_notification = new KNotification(QLatin1String("incoming_file_transfer"));
+    m_notification = new KNotification(QLatin1String("incoming_file_transfer"), 0, KNotification::Persistent);
     KAboutData aboutData("ktelepathy", 0, KLocalizedString(), 0);
     m_notification.data()->setComponentData(KComponentData(aboutData));
     m_notification.data()->setTitle(title);
@@ -134,6 +135,7 @@ void TubeChannelApprover::onChannelAccepted()
     //destroy the notification
     if (m_notification) {
         m_notification.data()->close();
+        m_notification.data()->deleteLater();
     }
 
     if (!m_service.isNull() && m_service->property(QLatin1String("X-KTp-Cancellable")).toBool()) {

-- 
ktp-approver packaging