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

The following commit has been merged in the master branch:
commit 2a4c211f978408b3d359c469a7ec337ec298eb3c
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Aug 29 20:51:24 2013 +0000

    Fix scrollback loading
    
    REVIEW: 112366
---
 lib/logmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index e54e109..31e1f74 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -155,7 +155,7 @@ void LogManager::onEventsFinished(KTp::PendingLoggerOperation *op)
     const QList<KTp::LogMessage> allMessages = logsOp->logs();
     QList<KTp::Message> messages;
     const KTp::MessageContext ctx(d->account, d->textChannel);
-    for (int i = 0; i < d->scrollbackLength && i < allMessages.count(); ++i) {
+    for (int i = qMax(allMessages.count() - d->scrollbackLength, 0) ; i < allMessages.count(); ++i) {
         const KTp::LogMessage message = allMessages[i];
         messages << KTp::MessageProcessor::instance()->processIncomingMessage(message, ctx);
     }

-- 
ktp-text-ui packaging