[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=642b552

The following commit has been merged in the master branch:
commit 642b552331ed5ef63064efe671ac6a214f2bf755
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Mar 18 01:54:30 2013 +0000

    Fix memory leak and close all text channels on exit
    
    BUG: 316694
    REVIEW: 109559
---
 KTp/Declarative/conversation.cpp        | 1 +
 KTp/Declarative/conversations-model.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index 6359c2a..3975e00 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -100,5 +100,6 @@ void Conversation::requestClose()
 Conversation::~Conversation()
 {
     kDebug();
+    requestClose();
     delete d;
 }
diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index eb51ed7..c713ce7 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -54,6 +54,7 @@ ConversationsModel::ConversationsModel(QObject *parent) :
 
 ConversationsModel::~ConversationsModel()
 {
+    qDeleteAll(d->conversations);
     delete d;
 }
 

-- 
ktp-common-internals packaging