[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=4e82e2e

The following commit has been merged in the master branch:
commit 4e82e2e447a694acbc6b26c4e33d3c4d9c407dfa
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Wed Oct 12 21:10:26 2011 +0200

    Set the parent for the LogManager instances
---
 lib/chat-widget.cpp | 2 +-
 lib/logmanager.cpp  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index c39e211..f1470fe 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -235,7 +235,7 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
     connect(d->ui.sendMessageBox, SIGNAL(scrollEventRecieved(QKeyEvent*)), d->ui.chatArea, SLOT(onScrollEvent(QKeyEvent*)));
 
     // initialize LogManager
-    d->logManager = new LogManager(account, channel->targetContact());
+    d->logManager = new LogManager(account, channel->targetContact(), this);
     d->logManager->setFetchAmount(3);
     d->logManager->setTextChannel(channel);
 }
diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index d7bbf4f..ae09703 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -45,7 +45,8 @@
 #include <TelepathyQt4/ReceivedMessage>
 
 LogManager::LogManager(const Tp::AccountPtr &account, const Tp::ContactPtr &contact, QObject *parent)
-    : m_account(account)
+    : QObject(parent)
+    , m_account(account)
     , m_contact(contact)
     , m_fetchAmount(10)
 {

-- 
ktp-text-ui packaging