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

The following commit has been merged in the master branch:
commit b82503a917b986fd5a70d156adf0466ddfb6047b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Mar 13 17:31:59 2013 +0000

    Update to new FilterFramework
    
    REVIEW: 109468
---
 CMakeLists.txt                                     | 2 +-
 filters/searchexpansion/searchexpansion-filter.cpp | 6 +++---
 filters/searchexpansion/searchexpansion-filter.h   | 2 +-
 lib/chat-widget.cpp                                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6591f5..6b5043e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(ktp-text-ui)
 
 set(KTP_TEXT_UI_VERSION "0.5.80")
-set(KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "3")
+set(KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "4")
 set(IS_KTP_INTERNAL_MODULE TRUE)
 
 # Include our extra FindFoo.cmake files.
diff --git a/filters/searchexpansion/searchexpansion-filter.cpp b/filters/searchexpansion/searchexpansion-filter.cpp
index 886bc32..91090f3 100644
--- a/filters/searchexpansion/searchexpansion-filter.cpp
+++ b/filters/searchexpansion/searchexpansion-filter.cpp
@@ -44,14 +44,14 @@ void SearchexpansionFilter::filterMessage(KTp::Message &message, const KTp::Mess
     Q_UNUSED(context);
 }
 
-void SearchexpansionFilter::filterOutgoingMessage(KTp::Message &message, const KTp::MessageContext &context)
+void SearchexpansionFilter::filterOutgoingMessage(KTp::OutgoingMessage &message, const KTp::MessageContext &context)
 {
     Q_UNUSED(context);
-    KUriFilterData data(message.mainMessagePart().trimmed());
+    KUriFilterData data(message.text().trimmed());
     if(KUriFilter::self()->filterSearchUri(data, KUriFilter::WebShortcutFilter)) {
 
 //         kDebug() << "Succesfully filtered" << data.typedString() << "to" << data.uri();
-        message.setMainMessagePart(data.uri().url());
+        message.setText(data.uri().url());
     }
 }
 
diff --git a/filters/searchexpansion/searchexpansion-filter.h b/filters/searchexpansion/searchexpansion-filter.h
index c4bcf44..28d59fe 100644
--- a/filters/searchexpansion/searchexpansion-filter.h
+++ b/filters/searchexpansion/searchexpansion-filter.h
@@ -29,7 +29,7 @@ public:
     SearchexpansionFilter(QObject *parent, const QVariantList &);
     virtual ~SearchexpansionFilter();
     virtual void filterMessage(KTp::Message &message, const KTp::MessageContext &context);
-    virtual void filterOutgoingMessage(KTp::Message &message, const KTp::MessageContext &context);
+    virtual void filterOutgoingMessage(KTp::OutgoingMessage &message, const KTp::MessageContext &context);
 
 private:
     class Private;
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index d1071f4..6cfbce6 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -713,7 +713,7 @@ void ChatWidget::sendMessage()
 
     if (!message.isEmpty()) {
         message = KTp::MessageProcessor::instance()->processOutgoingMessage(
-                    message, d->account, d->channel).mainMessagePart();
+                    message, d->account, d->channel).text();
 
         if (d->channel->supportsMessageType(Tp::ChannelTextMessageTypeAction) && message.startsWith(QLatin1String("/me "))) {
             //remove "/me " from the start of the message

-- 
ktp-text-ui packaging