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

The following commit has been merged in the master branch:
commit e90325f6842324a1303f4ebd9d4675ba814e3131
Author: Lasath Fernando <kde at lasath.org>
Date:   Mon Jun 25 10:46:20 2012 +1000

    Hardcode EscapeFilter
    
    As promised, this re-adds Escaping, except this time as a hardcoded
    filter, becuase we determined that such an essential security
    feature should not be optional.
---
 KTp/message-filters-private.h |  7 +++++++
 KTp/message-processor.cpp     | 13 +++----------
 KTp/message-processor.h       |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/KTp/message-filters-private.h b/KTp/message-filters-private.h
index cb9b20a..4e96ae0 100644
--- a/KTp/message-filters-private.h
+++ b/KTp/message-filters-private.h
@@ -30,4 +30,11 @@ public:
     void filterMessage(Message &message);
 };
 
+class EscapeFilter : public AbstractMessageFilter
+{
+public:
+    explicit EscapeFilter(QObject *parent = 0);
+    virtual void filterMessage(Message& message);
+};
+
 #endif
diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index 2a8770f..926bef7 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -48,17 +48,10 @@ MessageProcessor* MessageProcessor::instance()
 
 MessageProcessor::MessageProcessor()
 {
+    m_filters.append(new EscapeFilter(this));
+    m_filters.append(new UrlFilter(this));
+
     loadAllPlugins();
-    m_filters.prepend(new UrlFilter(this));
-
-    //FIXME: Massive hack to not escape URLs.
-    Q_FOREACH (AbstractMessageFilter *filter, m_filters) {
-        if (QLatin1String(filter->metaObject()->className()) == QLatin1String("EscapeFilter")) {
-            m_filters.removeOne(filter);
-            m_filters.prepend(filter);
-            break;
-        }
-    }
 }
 
 
diff --git a/KTp/message-processor.h b/KTp/message-processor.h
index 246f331..08cc386 100644
--- a/KTp/message-processor.h
+++ b/KTp/message-processor.h
@@ -37,6 +37,7 @@ class AbstractMessageFilter;
 //each thing that displays message will have an instance of this
 class KDE_TELEPATHY_CHAT_EXPORT MessageProcessor : public QObject
 {
+Q_OBJECT
 
 public:
     static MessageProcessor* instance();

-- 
ktp-common-internals packaging