[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=74923ab

The following commit has been merged in the master branch:
commit 74923ab77bc1522c532795476ac184fe2c6ff156
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jul 14 09:25:19 2013 +0000

    Make the text channel notifications peristant and delete on close
    
    This solves a bug in which notification buttons fail to work after a timeout
    
    BUG: 319290
    REVIEW: 111500
    FIXED-IN: 0.6.3
---
 src/textchannelapprover.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/textchannelapprover.cpp b/src/textchannelapprover.cpp
index f8225ef..d877ca5 100644
--- a/src/textchannelapprover.cpp
+++ b/src/textchannelapprover.cpp
@@ -48,6 +48,7 @@ TextChannelApprover::~TextChannelApprover()
     //destroy the notification
     if (m_notification) {
         m_notification.data()->close();
+        m_notification.data()->deleteLater();
     }
 }
 
@@ -58,7 +59,7 @@ void TextChannelApprover::onMessageReceived(const Tp::ReceivedMessage & msg)
     }
 
     if (!m_notification) {
-        m_notification = new KNotification("new_text_message");
+        m_notification = new KNotification("new_text_message", 0, KNotification::Persistent);
         KAboutData aboutData("ktelepathy",0,KLocalizedString(),0);
         m_notification.data()->setComponentData(KComponentData(aboutData));
 

-- 
ktp-approver packaging