[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=7a37192

The following commit has been merged in the master branch:
commit 7a3719232c63a1830c561fa119fb65ed6e5393e3
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Jun 18 19:21:12 2013 +0200

    When date of a message in scrollback changes, add a status message with the new date
    
    REVIEW: 111094
    BUG: 292041
    FIXED-IN: 0.7.0
---
 lib/chat-widget.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 9fdbdb7..ac8e3ba 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -482,8 +482,20 @@ void ChatWidget::onHistoryFetched(const QList<KTp::Message> &messages)
     d->chatViewInitialized = true;
 
     kDebug() << "found" << messages.count() << "messages in history";
-    Q_FOREACH(const KTp::Message &message, messages) {
-        d->ui.chatArea->addMessage(message);
+    if (!messages.isEmpty()) {
+        QDate date = messages.first().time().date();
+        Q_FOREACH(const KTp::Message &message, messages) {
+            if (message.time().date() != date) {
+                date = message.time().date();
+                d->ui.chatArea->addStatusMessage(date.toString(Qt::LocaleDate));
+            }
+
+            d->ui.chatArea->addMessage(message);
+        }
+
+        if (date != QDate::currentDate()) {
+            d->ui.chatArea->addStatusMessage(QDate::currentDate().toString(Qt::LocaleDate));
+        }
     }
 
     //process any messages we've 'missed' whilst initialising.

-- 
ktp-text-ui packaging