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

The following commit has been merged in the master branch:
commit a0bd507fa0b8a1ec158e3517c55a17c3dee52564
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 8 23:15:59 2012 +0000

    Process messages in the plasmoid through our message filter
    
    BUG: 293521
    REVIEW: 103901
---
 KTp/Declarative/messages-model.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index e4f1645..6cc7c90 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -24,6 +24,8 @@
 
 #include <TelepathyQt/ReceivedMessage>
 
+#include "lib/message-processor.h"
+
 class MessageItem
 {
 public:
@@ -143,7 +145,7 @@ void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
 
         d->messages.append(MessageItem(
                                message.sender()->alias(),
-                               message.text(),
+                               MessageProcessor::instance()->processIncomingMessage(message).finalizedMessage(),
                                message.received(),
                                MessageItem::Incoming,
                                message.messageToken()
@@ -172,7 +174,7 @@ void MessagesModel::onMessageSent(const Tp::Message &message, Tp::MessageSending
 
     d->messages.append(MessageItem(
                            i18n("Me"),   //FIXME : use actual nickname from Tp::AccountPtr
-                           message.text(),
+                           MessageProcessor::instance()->processOutgoingMessage(message).finalizedMessage(),
                            message.sent(),
                            MessageItem::Outgoing,
                            message.messageToken()

-- 
ktp-common-internals packaging