[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=1378619

The following commit has been merged in the master branch:
commit 1378619d193a3a003fcd29f1a5d399cb049ddb3f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jul 26 16:11:33 2012 +0100

    Don't leak ConversationsModel
    
    BUG: 303532
    Reviewed-by: George Kiagiadakis
---
 plasmoid/declarative-plugin/conversations-model.cpp     | 4 ++--
 plasmoid/declarative-plugin/conversations-model.h       | 2 +-
 plasmoid/declarative-plugin/telepathy-text-observer.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plasmoid/declarative-plugin/conversations-model.cpp b/plasmoid/declarative-plugin/conversations-model.cpp
index 4d22861..faaa60b 100644
--- a/plasmoid/declarative-plugin/conversations-model.cpp
+++ b/plasmoid/declarative-plugin/conversations-model.cpp
@@ -40,8 +40,8 @@ public:
     QList<Conversation*> conversations;
 };
 
-ConversationsModel::ConversationsModel() :
-        QAbstractListModel(),
+ConversationsModel::ConversationsModel(QObject *parent) :
+        QAbstractListModel(parent),
         Tp::AbstractClientHandler(channelClassList()),
         d(new ConversationsModelPrivate)
 {
diff --git a/plasmoid/declarative-plugin/conversations-model.h b/plasmoid/declarative-plugin/conversations-model.h
index cf03a74..f9dc047 100644
--- a/plasmoid/declarative-plugin/conversations-model.h
+++ b/plasmoid/declarative-plugin/conversations-model.h
@@ -33,7 +33,7 @@ class KDE_TELEPATHY_CHAT_EXPORT ConversationsModel : public QAbstractListModel,
 {
 Q_OBJECT
 public:
-    explicit ConversationsModel();
+    explicit ConversationsModel(QObject *parent);
     virtual ~ConversationsModel();
 
     virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const;
diff --git a/plasmoid/declarative-plugin/telepathy-text-observer.cpp b/plasmoid/declarative-plugin/telepathy-text-observer.cpp
index 089a2e5..98dfced 100644
--- a/plasmoid/declarative-plugin/telepathy-text-observer.cpp
+++ b/plasmoid/declarative-plugin/telepathy-text-observer.cpp
@@ -29,7 +29,7 @@
 
 TelepathyTextObserver::TelepathyTextObserver(QObject* parent) :
     QObject(parent),
-    m_handler(new ConversationsModel())
+    m_handler(new ConversationsModel(this))
 {
     kDebug();
     Tp::registerTypes();

-- 
ktp-text-ui packaging