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

The following commit has been merged in the master branch:
commit b5b12204b5777f95740e3d079071e5dad7f3e255
Author: Lasath Fernando <kde at lasath.org>
Date:   Sun Mar 3 15:50:49 2013 +1100

    Update SearchexpansionFilter
    
    Re-enable it, and make it use the new API. Also, make it acutally work
    on outgoing messages, now that it can.
---
 filters/CMakeLists.txt                             | 2 +-
 filters/searchexpansion/searchexpansion-filter.cpp | 6 +++++-
 filters/searchexpansion/searchexpansion-filter.h   | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt
index d21f619..9277261 100644
--- a/filters/CMakeLists.txt
+++ b/filters/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory(emoticons)
 add_subdirectory(formatting)
 add_subdirectory(images)
 #Commented out until https://bugs.kde.org/show_bug.cgi?id=304740
-# add_subdirectory(searchexpansion)
+add_subdirectory(searchexpansion)
 add_subdirectory(youtube)
 add_subdirectory(highlight)
 
diff --git a/filters/searchexpansion/searchexpansion-filter.cpp b/filters/searchexpansion/searchexpansion-filter.cpp
index fc5b26c..5bc0cc9 100644
--- a/filters/searchexpansion/searchexpansion-filter.cpp
+++ b/filters/searchexpansion/searchexpansion-filter.cpp
@@ -38,7 +38,11 @@ SearchexpansionFilter::~SearchexpansionFilter()
     delete d;
 }
 
-void SearchexpansionFilter::filterMessage(Message &message)
+void SearchexpansionFilter::filterMessage(KTp::Message &message, const KTp::MessageContext &context)
+{
+}
+
+void SearchexpansionFilter::filterOutgoingMessage(KTp::Message &message, const KTp::MessageContext &context)
 {
     KUriFilterData data(message.mainMessagePart().trimmed());
     if(KUriFilter::self()->filterSearchUri(data, KUriFilter::WebShortcutFilter)) {
diff --git a/filters/searchexpansion/searchexpansion-filter.h b/filters/searchexpansion/searchexpansion-filter.h
index 1d8f731..c4bcf44 100644
--- a/filters/searchexpansion/searchexpansion-filter.h
+++ b/filters/searchexpansion/searchexpansion-filter.h
@@ -28,7 +28,8 @@ class SearchexpansionFilter : public KTp::AbstractMessageFilter
 public:
     SearchexpansionFilter(QObject *parent, const QVariantList &);
     virtual ~SearchexpansionFilter();
-    virtual void filterMessage(KTp::Message &message);
+    virtual void filterMessage(KTp::Message &message, const KTp::MessageContext &context);
+    virtual void filterOutgoingMessage(KTp::Message &message, const KTp::MessageContext &context);
 
 private:
     class Private;

-- 
ktp-text-ui packaging