[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=36fe15d

The following commit has been merged in the master branch:
commit 36fe15dffac5cf9e47f59662641dd94529de222d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Aug 9 11:35:57 2012 +0100

    Run backlog through message processor
    
    Message now supports construction from both Tp::Message and
    Tpl::Message, this is now used by the message processor.
    
    LogManager is updated to run messages through the message processor
    
    REVIEW: 105943
---
 lib/logmanager.cpp        |  9 ++++-----
 lib/message-processor.cpp | 14 ++++++--------
 lib/message-processor.h   | 11 ++++++++---
 lib/message.cpp           | 14 ++++++++++++++
 lib/message.h             |  8 ++++++++
 5 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index d4736d4..943feb5 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -20,6 +20,7 @@
 #include "logmanager.h"
 
 #include "adium-theme-content-info.h"
+#include "message-processor.h"
 
 #include <KDebug>
 
@@ -170,7 +171,7 @@ void LogManager::onEventsFinished(Tpl::PendingOperation *po)
 
 
     QList<AdiumThemeContentInfo> messages;
-    Q_FOREACH(const Tpl::TextEventPtr& event, events) {
+    Q_FOREACH(const Tpl::TextEventPtr &event, events) {
         AdiumThemeMessageInfo::MessageType type;
         QString iconPath;
         Tp::ContactPtr contact;
@@ -186,10 +187,8 @@ void LogManager::onEventsFinished(Tpl::PendingOperation *po)
         iconPath = contact->avatarData().fileName;
 
         AdiumThemeContentInfo message(type);
-        // "\" characters are replaced with "\" to match with normal messages
-        // FIXME we should remove this when the history messages are filtered
-        //       through the message processor
-        message.setMessage(event->message().replace(QLatin1Char('\'), QLatin1String("\\")));
+
+        message.setMessage(MessageProcessor::instance()->processIncomingMessage(event).finalizedMessage());
         message.setService(m_account->serviceName());
         message.setSenderDisplayName(event->sender()->alias());
         message.setSenderScreenName(event->sender()->alias());
diff --git a/lib/message-processor.cpp b/lib/message-processor.cpp
index 09ab98e..25e8c70 100644
--- a/lib/message-processor.cpp
+++ b/lib/message-processor.cpp
@@ -58,23 +58,21 @@ MessageProcessor::~MessageProcessor()
 {
 }
 
-Message MessageProcessor::processIncomingMessage(const Tp::ReceivedMessage &receivedMessage)
+Message MessageProcessor::processIncomingMessage(Message receivedMessage)
 {
-    Message message(receivedMessage);
     Q_FOREACH(AbstractMessageFilter *filter, MessageProcessor::m_filters) {
         kDebug() << "running filter :" << filter->metaObject()->className();
-        filter->filterMessage(message);
+        filter->filterMessage(receivedMessage);
     }
-    return message;
+    return receivedMessage;
 }
 
-Message MessageProcessor::processOutgoingMessage(const Tp::Message &sentMessage)
+Message MessageProcessor::processOutgoingMessage(Message sentMessage)
 {
-    Message message(sentMessage);
     Q_FOREACH(AbstractMessageFilter *filter, MessageProcessor::m_filters) {
-        filter->filterMessage(message);
+        filter->filterMessage(sentMessage);
     }
-    return message;
+    return sentMessage;
 }
 
 void MessageProcessor::loadFilters() {
diff --git a/lib/message-processor.h b/lib/message-processor.h
index 2b070bd..425ad97 100644
--- a/lib/message-processor.h
+++ b/lib/message-processor.h
@@ -24,7 +24,8 @@
 #include <QList>
 #include <KPluginInfo>
 
-#include <message.h>
+#include "message.h"
+
 #include <ktpchat_export.h>
 
 namespace Tp
@@ -45,13 +46,17 @@ public:
     ~MessageProcessor();
 
     //text-ui will call this somewhere in handleIncommingMessage just before displaying it
-    Message processIncomingMessage(const Tp::ReceivedMessage &message);
-    Message processOutgoingMessage(const Tp::Message &message);
+    Message processIncomingMessage(Message message);
+    Message processOutgoingMessage(Message message);
 
 protected:
     explicit MessageProcessor();
 
 private:
+
+
+
+
     void loadFilters();
     static MessageProcessor* s_instance;
     QList<AbstractMessageFilter*> m_filters;
diff --git a/lib/message.cpp b/lib/message.cpp
index 9b6770b..6db648e 100644
--- a/lib/message.cpp
+++ b/lib/message.cpp
@@ -20,6 +20,10 @@
 #include "message.h"
 #include <KDebug>
 
+#ifdef TELEPATHY_LOGGER_QT4_FOUND
+#include <TelepathyLoggerQt4/TextEvent>
+#endif
+
 Message::Message(const Tp::Message &original) :
       m_sentTime(original.sent()),
       m_token(original.messageToken()),
@@ -28,6 +32,16 @@ Message::Message(const Tp::Message &original) :
     setMainMessagePart(original.text());
 }
 
+#ifdef TELEPATHY_LOGGER_QT4_FOUND
+Message::Message(const Tpl::TextEventPtr &original) :
+    m_sentTime(original->timestamp()),
+    m_token(original->messageToken()),
+    m_messageType(original->messageType())
+{
+    setMainMessagePart(original->message());
+}
+#endif
+
 QString Message::mainMessagePart() const
 {
     return m_mainPart;
diff --git a/lib/message.h b/lib/message.h
index 2f18d78..ef9530b 100644
--- a/lib/message.h
+++ b/lib/message.h
@@ -22,6 +22,10 @@
 
 #include <TelepathyQt/Message>
 
+#ifdef TELEPATHY_LOGGER_QT4_FOUND
+#include <TelepathyLoggerQt4/Types>
+#endif
+
 #include <ktpchat_export.h>
 
 /*!
@@ -44,6 +48,10 @@ class KDE_TELEPATHY_CHAT_EXPORT Message {
 public:
     Message(const Tp::Message& original);
 
+#ifdef TELEPATHY_LOGGER_QT4_FOUND
+    Message(const Tpl::TextEventPtr &original);
+#endif
+
     /*! rief The body of the message
      * 
eturn the contents of the body of the message, as HTML
      */

-- 
ktp-text-ui packaging