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

The following commit has been merged in the master branch:
commit b1475bb84f820e76633d757d18f6eb93880c8809
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sat Aug 31 15:54:05 2013 +0200

    Set message token of KTp::LogMessage
---
 KTp/Logger/log-message.cpp                             | 4 +++-
 KTp/Logger/log-message.h                               | 3 ++-
 KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/KTp/Logger/log-message.cpp b/KTp/Logger/log-message.cpp
index 7fc7735..5c0d64d 100644
--- a/KTp/Logger/log-message.cpp
+++ b/KTp/Logger/log-message.cpp
@@ -23,7 +23,8 @@
 using namespace KTp;
 
 LogMessage::LogMessage(const LogEntity &from, const Tp::AccountPtr &account,
-                       const QDateTime &dt, const QString &message):
+                       const QDateTime &dt, const QString &message,
+                       const QString &messageToken):
     Message(new KTp::Message::Private)
 {
     d->senderId = from.id();
@@ -31,6 +32,7 @@ LogMessage::LogMessage(const LogEntity &from, const Tp::AccountPtr &account,
     d->isHistory = true;
     d->messageType = Tp::ChannelTextMessageTypeNormal;
     d->sentTime = dt;
+    d->token = messageToken;
 
     setMainMessagePart(message);
 
diff --git a/KTp/Logger/log-message.h b/KTp/Logger/log-message.h
index 1f9a39b..d61d47d 100644
--- a/KTp/Logger/log-message.h
+++ b/KTp/Logger/log-message.h
@@ -41,7 +41,8 @@ class KTP_EXPORT LogMessage : public KTp::Message
 {
   public:
     explicit LogMessage(const KTp::LogEntity &from, const Tp::AccountPtr &account,
-                        const QDateTime &dt, const QString &message);
+                        const QDateTime &dt, const QString &message,
+                        const QString &messageToken);
     LogMessage(const LogMessage& other);
 
     virtual ~LogMessage();
diff --git a/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp b/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
index 9ebc8e5..6990d5f 100644
--- a/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
+++ b/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
@@ -61,7 +61,8 @@ void PendingTpLoggerLogs::logsRetrieved(Tpl::PendingOperation *op)
     Q_FOREACH (const Tpl::EventPtr &event, events) {
         const Tpl::TextEventPtr textEvent = event.dynamicCast<Tpl::TextEvent>();
         logs << KTp::LogMessage(Utils::fromTplEntity(event->sender()),
-                                account(), event->timestamp(), textEvent->message());
+                                account(), event->timestamp(), textEvent->message(),
+                                textEvent->messageToken());
     }
 
     appendLogs(logs);

-- 
ktp-common-internals packaging