[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=55d5b41

The following commit has been merged in the master branch:
commit 55d5b414be486778714bdc803ade9804a68872bf
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Jul 14 22:07:13 2012 +1000

    Make MessagesConfig use PluginConfigManager
    
    Now it no longer needs a MessageProcessor instance, and thus won't have
    to load the plugins at all if run from a kcmshell4.
---
 config/messages-config.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/messages-config.cpp b/config/messages-config.cpp
index 5398703..92f8286 100644
--- a/config/messages-config.cpp
+++ b/config/messages-config.cpp
@@ -18,6 +18,7 @@
 
 #include "messages-config.h"
 #include "message-processor.h"
+#include <plugin-config-manager.h>
 
 #include <QVBoxLayout>
 
@@ -32,13 +33,12 @@ K_EXPORT_PLUGIN(KTpMessagesConfigFactory("kcm_ktp_message_filters", "kcm_ktp_cha
 MessagesConfig::MessagesConfig(QWidget *parent, const QVariantList &args)
     : PluginPage(KTpMessagesConfigFactory::componentData(), parent, args)
 {
-    KPluginInfo::List plugins = MessageProcessor::pluginList();
     pluginSelector()->addPlugins(
-        plugins,
+        PluginConfigManager::self()->allPlugins(),
         KPluginSelector::ReadConfigFile,
         QString(),
         QString(),
-        KSharedConfig::openConfig(QLatin1String("ktelepathyrc"))
+        PluginConfigManager::self()->sharedConfig() //why won't this take a KConfigGroup?
     );
 
     //Am surprised that PluginPage() doesn't do this for me

-- 
ktp-text-ui packaging