[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=3162cec

The following commit has been merged in the master branch:
commit 3162cecf325f453dfccdb9c2192608c9a6257f78
Author: Lasath Fernando <kde at lasath.org>
Date:   Wed Jul 4 14:26:54 2012 +1000

    Implement Searchexpansion filter
    
    This simply takes the whole message and passes it to KUriFilter
    to 'filter'. If it was succesful (meaning message was a web
    shortcut), it replaces it with the filtered uri.
    
    Note: The stuck in Url doesn't go through UrlFilter again, so
    it won't be clickable. Should it matter, since this is outgoing
    anyway?
---
 filters/searchexpansion/CMakeLists.txt             |  1 +
 filters/searchexpansion/searchexpansion-filter.cpp | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/filters/searchexpansion/CMakeLists.txt b/filters/searchexpansion/CMakeLists.txt
index f3dcbc6..dff1dde 100644
--- a/filters/searchexpansion/CMakeLists.txt
+++ b/filters/searchexpansion/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries (ktptextui_message_filter_searchexpansion
     ktpchat
     ${QT_LIBRARIES}
     ${KDE4_KDEUI_LIBS}
+    ${KDE4_KIO_LIBS}
     ${TELEPATHY_QT4_LIBRARIES}
     ${KDE4_KEMOTICONS_LIBS}
 )
diff --git a/filters/searchexpansion/searchexpansion-filter.cpp b/filters/searchexpansion/searchexpansion-filter.cpp
index b44c8fe..bc1f733 100644
--- a/filters/searchexpansion/searchexpansion-filter.cpp
+++ b/filters/searchexpansion/searchexpansion-filter.cpp
@@ -18,18 +18,13 @@
 
 #include "searchexpansion-filter.h"
 
-#include <QStringBuilder>
-#include <QRegExp>
-#include <QImageReader>
-
 #include <KPluginFactory>
 #include <KDebug>
 #include <KUrl>
-#include <KLocalizedString>
+#include <KUriFilter>
 
 class SearchexpansionFilter::Private {
 public:
-    QRegExp imageRegex;
 };
 
 SearchexpansionFilter::SearchexpansionFilter (QObject* parent, const QVariantList&) :
@@ -39,6 +34,12 @@ SearchexpansionFilter::SearchexpansionFilter (QObject* parent, const QVariantLis
 
 void SearchexpansionFilter::filterMessage (Message& message)
 {
+    KUriFilterData data(message.mainMessagePart());
+    if(KUriFilter::self()->filterSearchUri(data, KUriFilter::WebShortcutFilter)) {
+
+        kDebug() << "Succesfully filtered" << data.typedString() << "to" << data.uri();
+        message.setMainMessagePart(data.uri().url());
+    }
 }
 
 K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<SearchexpansionFilter>();)

-- 
ktp-text-ui packaging