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

The following commit has been merged in the master branch:
commit 4d17b9e8d7cae54d1e791f2f0bd5a1212a32b1b1
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sat Aug 31 15:55:33 2013 +0200

    Exclude enqueued messages from scrollback
    
    Reviewed-By: David Edmundson
    BUG: 324321
---
 lib/logmanager.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index 31e1f74..30b0141 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -151,12 +151,24 @@ void LogManager::onEventsFinished(KTp::PendingLoggerOperation *op)
         return;
     }
 
+    QStringList queuedMessageTokens;
+    if (!d->textChannel.isNull()) {
+        Q_FOREACH(const Tp::ReceivedMessage &message, d->textChannel->messageQueue()) {
+            queuedMessageTokens.append(message.messageToken());
+        }
+    }
+    kDebug() << "queuedMessageTokens" << queuedMessageTokens;
+
     // get last n (d->fetchLast) messages that are not queued
     const QList<KTp::LogMessage> allMessages = logsOp->logs();
     QList<KTp::Message> messages;
     const KTp::MessageContext ctx(d->account, d->textChannel);
     for (int i = qMax(allMessages.count() - d->scrollbackLength, 0) ; i < allMessages.count(); ++i) {
         const KTp::LogMessage message = allMessages[i];
+        if (queuedMessageTokens.contains(message.token())) {
+            continue;
+        }
+
         messages << KTp::MessageProcessor::instance()->processIncomingMessage(message, ctx);
     }
 

-- 
ktp-text-ui packaging