[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=fa0b40a

The following commit has been merged in the master branch:
commit fa0b40a5852d03ce0ba616d8831bf34a0d628726
Author: Siddhartha Sahu <sh.siddhartha at gmail.com>
Date:   Fri Nov 15 15:21:03 2013 +0530

    add check for messages loading
---
 KTp/Declarative/messages-model.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index b70b9cd..bc51e3e 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -57,6 +57,7 @@ class MessagesModel::MessagesModelPrivate
     // For fast lookup of original messages upon receipt of a message delivery report.
     QHash<QString /*messageToken*/, QPersistentModelIndex> messagesByMessageToken;
     bool visible;
+    bool logsLoaded;
 };
 
 MessagesModel::MessagesModel(const Tp::AccountPtr &account, QObject *parent) :
@@ -80,6 +81,7 @@ MessagesModel::MessagesModel(const Tp::AccountPtr &account, QObject *parent) :
     d->visible = false;
 
     d->logManager = new ScrollbackManager(this);
+    d->logsLoaded = false;
     connect(d->logManager, SIGNAL(fetched(QList<KTp::Message>)), SLOT(onHistoryFetched(QList<KTp::Message>)));
 
     //Load configuration for number of message to show
@@ -131,7 +133,11 @@ void MessagesModel::setTextChannel(const Tp::TextChannelPtr &channel)
     d->textChannel = channel;
 
     d->logManager->setTextChannel(d->account, d->textChannel);
-    d->logManager->fetchScrollback();
+
+    //Load messages unless they have already been loaded
+    if(!d->logsLoaded) {
+        d->logManager->fetchScrollback();
+    }
 
     QList<Tp::ReceivedMessage> messageQueue = channel->messageQueue();
     Q_FOREACH(const Tp::ReceivedMessage &message, messageQueue) {
@@ -161,6 +167,7 @@ void MessagesModel::onHistoryFetched(const QList<KTp::Message> &messages)
         }
         endInsertRows();
     }
+    d->logsLoaded = true;
 }
 
 void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)

-- 
ktp-common-internals packaging