[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=2c61654

The following commit has been merged in the master branch:
commit 2c6165414e633f84acd645e294f556ac6ce696ef
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Jul 21 00:42:07 2013 +0200

    Show scrollback and enable 'Previous Conversations' action in group chats
    
    REVIEW: 111524
---
 lib/chat-widget.cpp | 14 +++++---------
 lib/logmanager.cpp  | 50 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index ac8e3ba..74cee48 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -173,15 +173,11 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
     connect(d->pausedStateTimer, SIGNAL(timeout()), this, SLOT(onChatPausedTimerExpired()));
 
     // initialize LogManager
-    if (!d->isGroupChat) {
-        KConfig config(QLatin1String("ktelepathyrc"));
-        KConfigGroup tabConfig = config.group("Behavior");
-        d->logManager->setScrollbackLength(tabConfig.readEntry<int>("scrollbackLength", 4));
-        d->logManager->setTextChannel(d->account, d->channel);
-        m_previousConversationAvailable = d->logManager->exists();
-    } else {
-        m_previousConversationAvailable = false;
-    }
+    KConfig config(QLatin1String("ktelepathyrc"));
+    KConfigGroup tabConfig = config.group("Behavior");
+    d->logManager->setScrollbackLength(tabConfig.readEntry<int>("scrollbackLength", 4));
+    d->logManager->setTextChannel(d->account, d->channel);
+    m_previousConversationAvailable = d->logManager->exists();
 
     d->notifyFilter = new NotifyFilter(this);
 }
diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index b0f94d6..6cd1aec 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -58,16 +58,22 @@ LogManager::~LogManager()
 
 bool LogManager::exists() const
 {
-    if (!m_account.isNull() && !m_textChannel.isNull() && m_textChannel->targetHandleType() == Tp::HandleTypeContact) {
-        Tpl::EntityPtr contactEntity = Tpl::Entity::create(m_textChannel->targetContact()->id().toLatin1().data(),
-                                                           Tpl::EntityTypeContact,
-                                                           NULL,
-                                                           NULL);
+    if (m_account.isNull() || m_textChannel.isNull() ) {
+        return false;
+    }
 
-        return m_logManager->exists(m_account, contactEntity, Tpl::EventTypeMaskText);
+    Tpl::EntityPtr contactEntity;
+    if (m_textChannel->targetHandleType() == Tp::HandleTypeContact) {
+        contactEntity = Tpl::Entity::create(m_textChannel->targetContact()->id().toLatin1().data(),
+                                            Tpl::EntityTypeContact, NULL, NULL);
+    } else if (m_textChannel->targetHandleType() == Tp::HandleTypeRoom) {
+        contactEntity = Tpl::Entity::create(m_textChannel->targetId().toLatin1().data(),
+                                            Tpl::EntityTypeRoom, NULL, NULL);
     } else {
         return false;
     }
+
+    return m_logManager->exists(m_account, contactEntity, Tpl::EventTypeMaskText);
 }
 
 void LogManager::setTextChannel(const Tp::AccountPtr &account, const Tp::TextChannelPtr &textChannel)
@@ -93,20 +99,24 @@ void LogManager::fetchScrollback()
 
 void LogManager::fetchHistory(int n)
 {
-    // Skip if no messages are requested
-    if (n > 0 && !m_account.isNull() && !m_textChannel.isNull()
-        && m_textChannel->targetHandleType() == Tp::HandleTypeContact) {
-        Tpl::EntityPtr contactEntity = Tpl::Entity::create(m_textChannel->targetContact()->id().toLatin1().data(),
-                                                Tpl::EntityTypeContact,
-                                                NULL,
-                                                NULL);
-
-        Tpl::LogWalkerPtr walker = m_logManager->queryWalkFilteredEvents(
-            m_account, contactEntity, Tpl::EventTypeMaskText, 0, 0);
-        Tpl::PendingEvents *events = walker->queryEvents(n);
-        connect(events, SIGNAL(finished(Tpl::PendingOperation*)),
-                this, SLOT(onEventsFinished(Tpl::PendingOperation*)));
-        return;
+    if (n > 0 && !m_account.isNull() && !m_textChannel.isNull()) {
+        Tpl::EntityPtr contactEntity;
+        if (m_textChannel->targetHandleType() == Tp::HandleTypeContact) {
+            contactEntity = Tpl::Entity::create(m_textChannel->targetContact()->id().toLatin1().data(),
+                                                Tpl::EntityTypeContact, NULL, NULL);
+        } else if (m_textChannel->targetHandleType() == Tp::HandleTypeRoom) {
+            contactEntity = Tpl::Entity::create(m_textChannel->targetId().toLatin1().data(),
+                                                Tpl::EntityTypeRoom, NULL, NULL);
+        }
+
+        if (!contactEntity.isNull()) {
+            Tpl::LogWalkerPtr walker = m_logManager->queryWalkFilteredEvents(
+                m_account, contactEntity, Tpl::EventTypeMaskText, 0, 0);
+            Tpl::PendingEvents *events = walker->queryEvents(n);
+            connect(events, SIGNAL(finished(Tpl::PendingOperation*)),
+                    this, SLOT(onEventsFinished(Tpl::PendingOperation*)));
+            return;
+        }
     }
 
     //in all other cases finish immediately.

-- 
ktp-text-ui packaging