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

The following commit has been merged in the master branch:
commit f21b0ab2711b6416adb4c2d16ba58893b0ef6d19
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
---
 lib/message-processor.h                        | 6 +++++-
 lib/message.h                                  | 4 +++-
 plasmoid/declarative-plugin/messages-model.cpp | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/message-processor.h b/lib/message-processor.h
index 55f57e1..d6228b5 100644
--- a/lib/message-processor.h
+++ b/lib/message-processor.h
@@ -21,8 +21,12 @@
 #define MESSAGE_PROCESSOR_H
 
 #include "message.h"
+
 #include <QList>
 
+#include <ktpchat_export.h>
+
+
 class AbstractMessageFilter : public QObject
 {
 Q_OBJECT
@@ -34,7 +38,7 @@ public:
 };
 
 //each thing that displays message will have an instance of this
-class MessageProcessor : public QObject
+class KDE_TELEPATHY_CHAT_EXPORT MessageProcessor : public QObject
 {
 
 public:
diff --git a/lib/message.h b/lib/message.h
index cccf150..c9d4340 100644
--- a/lib/message.h
+++ b/lib/message.h
@@ -22,7 +22,9 @@
 
 #include <TelepathyQt/Message>
 
-class Message {
+#include <ktpchat_export.h>
+
+class KDE_TELEPATHY_CHAT_EXPORT Message {
 
 public:
     Message(const Tp::Message& original);
diff --git a/plasmoid/declarative-plugin/messages-model.cpp b/plasmoid/declarative-plugin/messages-model.cpp
index e4f1645..6cc7c90 100644
--- a/plasmoid/declarative-plugin/messages-model.cpp
+++ b/plasmoid/declarative-plugin/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-text-ui packaging