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

The following commit has been merged in the master branch:
commit fbdebd087dc72b514b2423abfddf672a9052469c
Author: Andrea Scarpino <andrea at archlinux.org>
Date:   Tue Jan 29 22:59:04 2013 +0059

    Show the first message time as chat starting time
    
    BUG: 312603
    FIXED-IN: 0.5.3
    (cherry picked from commit d12ffbd79d36d9e40753c6dfc80ab20bb12a018c)
    
    Conflicts:
    	lib/chat-widget.cpp
---
 lib/chat-widget.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 93eda40..fd45728 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -165,7 +165,14 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
 
     //set up anything related to 'self'
     info.setOutgoingIconPath(d->channel->groupSelfContact()->avatarData().fileName);
-    info.setTimeOpened(QDateTime::currentDateTime());
+
+    //set the message time
+    if (!d->channel->messageQueue().isEmpty()) {
+        info.setTimeOpened(d->channel->messageQueue().first().received());
+    } else {
+        info.setTimeOpened(QDateTime::currentDateTime());
+    }
+
     info.setServiceIconImage(KIconLoader::global()->iconPath(d->account->iconName(), KIconLoader::Panel));
     connect(d->ui.chatArea, SIGNAL(loadFinished(bool)), SLOT(chatViewReady()), Qt::QueuedConnection);
     d->ui.chatArea->initialise(info);

-- 
ktp-text-ui packaging