[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=987734d

The following commit has been merged in the master branch:
commit 987734dabd0fb0d39068bff6ddee5a2c91ef7dd2
Author: Lasath Fernando <kde at lasath.org>
Date:   Mon Feb 25 18:37:22 2013 -0500

    Update Highlight filter
---
 filters/CMakeLists.txt                                       | 2 +-
 filters/highlight/CMakeLists.txt                             | 1 +
 filters/highlight/highlight-filter.cpp                       | 4 ++--
 filters/highlight/highlight-filter.h                         | 6 +++---
 filters/highlight/ktptextui_message_filter_highlight.desktop | 9 +++++----
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt
index c10a7f1..d21f619 100644
--- a/filters/CMakeLists.txt
+++ b/filters/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory(images)
 #Commented out until https://bugs.kde.org/show_bug.cgi?id=304740
 # add_subdirectory(searchexpansion)
 add_subdirectory(youtube)
+add_subdirectory(highlight)
 
 
 IF (EXISTS "${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml")
@@ -16,4 +17,3 @@ if(HAS_KTTS)
 endif(HAS_KTTS)
 
 macro_log_feature(HAS_KTTS "KTTSD" "KDE Text to Speech Deamon" "" FALSE "" "Needed for optional tts message plugin")
-add_subdirectory(highlight)
diff --git a/filters/highlight/CMakeLists.txt b/filters/highlight/CMakeLists.txt
index 29238fb..3d6df3a 100644
--- a/filters/highlight/CMakeLists.txt
+++ b/filters/highlight/CMakeLists.txt
@@ -11,6 +11,7 @@ target_link_libraries (ktptextui_message_filter_highlight
     ${QT_LIBRARIES}
     ${KDE4_KDECORE_LIBS}
     ${TELEPATHY_QT4_LIBRARIES}
+    ${KTP_LIBRARIES}
 )
 
 # Install:
diff --git a/filters/highlight/highlight-filter.cpp b/filters/highlight/highlight-filter.cpp
index c0f85cd..38b998d 100644
--- a/filters/highlight/highlight-filter.cpp
+++ b/filters/highlight/highlight-filter.cpp
@@ -36,7 +36,7 @@ public:
 };
 
 HighlightFilter::HighlightFilter(QObject *parent, const QVariantList &) :
-    AbstractMessageFilter(parent), d(new Private)
+    KTp::AbstractMessageFilter(parent), d(new Private)
 {
     d->accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus());
     d->accountManager->becomeReady();
@@ -47,7 +47,7 @@ HighlightFilter::~HighlightFilter()
     delete d;
 }
 
-void HighlightFilter::filterMessage(Message &message)
+void HighlightFilter::filterMessage(KTp::Message &message, const KTp::MessageContext&)
 {
     QString msg = message.mainMessagePart();
 
diff --git a/filters/highlight/highlight-filter.h b/filters/highlight/highlight-filter.h
index 3848304..bb3a158 100644
--- a/filters/highlight/highlight-filter.h
+++ b/filters/highlight/highlight-filter.h
@@ -19,16 +19,16 @@
 #ifndef HIGHLIGHT_FILTER_H
 #define HIGHLIGHT_FILTER_H
 
-#include <KTp/AbstractMessageFilter>
+#include <KTp/abstract-message-filter.h>
 
-class HighlightFilter : public AbstractMessageFilter
+class HighlightFilter : public KTp::AbstractMessageFilter
 {
     Q_OBJECT
 
 public:
     HighlightFilter(QObject *parent, const QVariantList &);
     virtual ~HighlightFilter();
-    virtual void filterMessage(Message &message);
+    virtual void filterMessage(KTp::Message &message, const KTp::MessageContext &context);
 
 private:
     class Private;
diff --git a/filters/highlight/ktptextui_message_filter_highlight.desktop b/filters/highlight/ktptextui_message_filter_highlight.desktop
index 45ce2d7..e4457b1 100644
--- a/filters/highlight/ktptextui_message_filter_highlight.desktop
+++ b/filters/highlight/ktptextui_message_filter_highlight.desktop
@@ -7,10 +7,11 @@ X-KDE-Library=ktptextui_message_filter_highlight
 X-KDE-PluginInfo-Author=Lasath Fernando
 X-KDE-PluginInfo-Email=kde at lasath.org
 X-KDE-PluginInfo-Name=highlight
-X-KDE-PluginInfo-Version=0.4
-X-KDE-PluginInfo-Website=http://community.kde.org/Real-Time_Communication_and_Collaboration
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=false
+X-KDE-PluginInfo-Version=0.6
+X-KDE-PluginInfo-Website=http://community.kde.org/KTp
+X-KDE-PluginInfo-License=LGPL
+X-KDE-PluginInfo-EnabledByDefault=true
+X-KTp-PluginInfo-Version=2
 
 Name=Highlight
 Comment=If any incoming messages contain your nickname, it will highlight them in red
\ No newline at end of file

-- 
ktp-text-ui packaging