[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=75aa63a

The following commit has been merged in the master branch:
commit 75aa63a3d7f2d6e394cdf57277351254c72c4b1c
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Tue Oct 11 20:44:24 2011 +0300

    Show the time that the message was sent, if possible.
    
    On certain protocols messages may be delivered later,
    for example, when somebody writes you while you are offline.
    In this case, the ui should show the time that the message was sent.
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 lib/chat-widget.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 302d097..f0d618e 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -562,7 +562,12 @@ void ChatWidget::handleIncomingMessage(const Tp::ReceivedMessage &message)
             AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::RemoteToLocal);
 
             messageInfo.setMessage(message.text());
-            messageInfo.setTime(message.received());
+
+            QDateTime time = message.sent();
+            if (!time.isValid()) {
+                time = message.received();
+            }
+            messageInfo.setTime(time);
 
             if (message.sender().isNull()) {
                 // just need this info

-- 
ktp-text-ui packaging