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

The following commit has been merged in the master branch:
commit d16b562e07cd1f9462e14327b93f6e34d6bd4319
Author: Lasath Fernando <kde at lasath.org>
Date:   Fri Jul 13 01:00:22 2012 +1000

    Make MessagesConfig actually show the plugins
    
    And implement (delegate) methods for saving configs.
---
 config/CMakeLists.txt                              |  1 +
 config/messages-config.cpp                         | 24 +++++++++++++++++++++-
 config/messages-config.h                           |  3 +++
 .../ktptextui_message_filter_formatting.desktop    |  1 +
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 97874dd..c1e8e5d 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(kcm_ktp_chat_messages
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KUTILS_LIBS}
+    ktpchat
 )
 
 
diff --git a/config/messages-config.cpp b/config/messages-config.cpp
index d09da5c..f8f863c 100644
--- a/config/messages-config.cpp
+++ b/config/messages-config.cpp
@@ -17,10 +17,14 @@
 */
 
 #include "messages-config.h"
+#include "message-processor.h"
 
+#include <QVBoxLayout>
+
+#include <KPluginInfo>
 #include <KPluginFactory>
 #include <KPluginSelector>
-#include <QVBoxLayout>
+#include <KDebug>
 
 K_PLUGIN_FACTORY(KTpMessagesConfigFactory, registerPlugin<MessagesConfig>();)
 K_EXPORT_PLUGIN(KTpMessagesConfigFactory("kcm_ktp_message_filters", "kcm_ktp_chat_messages"))
@@ -39,4 +43,22 @@ MessagesConfig::MessagesConfig(QWidget *parent, const QVariantList &args)
     QLayout *layout = new QVBoxLayout(this);
     layout->addWidget(d->selector);
     setLayout(layout);
+
+    KPluginInfo::List plugins = MessageProcessor::pluginList();
+    d->selector->addPlugins(plugins);
+
+    connect(d->selector, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
+}
+
+void MessagesConfig::save()
+{
+    kDebug();
+    d->selector->save();
+    KCModule::save();
+}
+
+void MessagesConfig::defaults()
+{
+    d->selector->defaults();
+    KCModule::defaults();
 }
\ No newline at end of file
diff --git a/config/messages-config.h b/config/messages-config.h
index 82e2282..48148a8 100644
--- a/config/messages-config.h
+++ b/config/messages-config.h
@@ -29,6 +29,9 @@ Q_OBJECT
 public:
     explicit MessagesConfig(QWidget *parent = 0, const QVariantList &args = QVariantList());
 
+    virtual void save();
+    virtual void defaults();
+
 private:
     class Private;
     Private* d;
diff --git a/filters/formatting/ktptextui_message_filter_formatting.desktop b/filters/formatting/ktptextui_message_filter_formatting.desktop
index 316b4e3..866bebe 100644
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
+Name=Google-Talk Formatting
 Comment=//TODO:.
 Comment[da]=//TODO:.
 Comment[el]=//TODO:.

-- 
ktp-text-ui packaging