[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=67bde71

The following commit has been merged in the master branch:
commit 67bde71843ebb73515f0766064b53fd06ceb8b7e
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Mar 2 00:54:48 2013 -0500

    Fix bug in KTp::Message with time
    
    In the constructor from Tp::RecievedMessage, check if sent() is
    null and if so, replace it with recieved().
---
 KTp/message.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/KTp/message.cpp b/KTp/message.cpp
index b6a4254..12eb24b 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -72,7 +72,12 @@ Message::Message(const Tp::ReceivedMessage &original, const KTp::MessageContext
     d(new Private)
 {
     Q_UNUSED(context)
+
     d->sentTime = original.sent();
+    if (d->sentTime.isNull()) {
+        d->sentTime = original.received();
+    }
+
     d->token = original.messageToken();
     d->messageType = original.messageType();
     d->isHistory = original.isScrollback();

-- 
ktp-common-internals packaging