[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=004cc2c

The following commit has been merged in the master branch:
commit 004cc2cdfbbf03cf8047666402f9db9d559705bd
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Sep 11 23:47:56 2012 +0100

    Add review comments
    Update TTS plugin to only speak incoming messages
---
 filters/texttospeech/CMakeLists.txt                       | 1 -
 filters/texttospeech/ktptextui_message_filter_tts.desktop | 4 ++--
 filters/texttospeech/tts-filter.cpp                       | 8 +++++---
 filters/texttospeech/tts-filter.h                         | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/filters/texttospeech/CMakeLists.txt b/filters/texttospeech/CMakeLists.txt
index 4de03cb..df9665a 100644
--- a/filters/texttospeech/CMakeLists.txt
+++ b/filters/texttospeech/CMakeLists.txt
@@ -16,7 +16,6 @@ target_link_libraries (ktptextui_message_filter_tts
     ${QT_LIBRARIES}
     ${KDE4_KDEUI_LIBS}
     ${TELEPATHY_QT4_LIBRARIES}
-    ${KDE4_KEMOTICONS_LIBS}
 )
 
 # Install:
diff --git a/filters/texttospeech/ktptextui_message_filter_tts.desktop b/filters/texttospeech/ktptextui_message_filter_tts.desktop
index b0df7be..9f5671e 100644
--- a/filters/texttospeech/ktptextui_message_filter_tts.desktop
+++ b/filters/texttospeech/ktptextui_message_filter_tts.desktop
@@ -8,7 +8,7 @@ X-KDE-Library=ktptextui_message_filter_tts
 X-KDE-PluginInfo-Author=David Edmundson
 X-KDE-PluginInfo-Email=davidedmundson at kde.org
 X-KDE-PluginInfo-Name=tts
-X-KDE-PluginInfo-Version=0.4
+X-KDE-PluginInfo-Version=0.6
 X-KDE-PluginInfo-Website=http://community.kde.org/Real-Time_Communication_and_Collaboration
-X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-License=LGPL
 X-KDE-PluginInfo-EnabledByDefault=false
diff --git a/filters/texttospeech/tts-filter.cpp b/filters/texttospeech/tts-filter.cpp
index aeda0c7..2df979e 100644
--- a/filters/texttospeech/tts-filter.cpp
+++ b/filters/texttospeech/tts-filter.cpp
@@ -32,8 +32,9 @@ public:
     org::kde::KSpeech *kspeech;
 };
 
-TTSFilter::TTSFilter (QObject* parent, const QVariantList&) :
-    AbstractMessageFilter (parent), d(new Private)
+TTSFilter::TTSFilter(QObject *parent, const QVariantList &)
+    : AbstractMessageFilter(parent),
+      d(new Private)
 {
     d->kspeech = new org::kde::KSpeech(QLatin1String("org.kde.kttsd"), QLatin1String("/KSpeech"), QDBusConnection::sessionBus());
     d->kspeech->setApplicationName(i18n("KDE Instant Messaging"));
@@ -41,10 +42,11 @@ TTSFilter::TTSFilter (QObject* parent, const QVariantList&) :
 
 TTSFilter::~TTSFilter()
 {
+    delete d->kspeech;
     delete d;
 }
 
-void TTSFilter::filterMessage (Message& message)
+void TTSFilter::filterIncomingMessage(Message &message)
 {
     //FIXME with real name.
     d->kspeech->say(i18n("New message. %1").arg(message.mainMessagePart()), KSpeech::soHtml);
diff --git a/filters/texttospeech/tts-filter.h b/filters/texttospeech/tts-filter.h
index 609ed57..ab4f74e 100644
--- a/filters/texttospeech/tts-filter.h
+++ b/filters/texttospeech/tts-filter.h
@@ -26,9 +26,9 @@ class TTSFilter : public AbstractMessageFilter
 Q_OBJECT
 
 public:
-    TTSFilter (QObject* parent, const QVariantList &);
+    TTSFilter(QObject *parent, const QVariantList &);
     virtual ~TTSFilter();
-    virtual void filterMessage (Message& message);
+    virtual void filterIncomingMessage(Message &message);
 
 private:
     class Private;

-- 
ktp-text-ui packaging