[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=fde4de6

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

    Rename MessageProcessor::loadAllPlugins()
    
    Since it no longer loads 'all' plugins, merely the ones that are
    enabled.
---
 KTp/message-processor.cpp | 4 ++--
 KTp/message-processor.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index 58a9998..27fa6c2 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -52,7 +52,7 @@ MessageProcessor::MessageProcessor()
     m_filters.append(new EscapeFilter(this));
     m_filters.append(new UrlFilter(this));
 
-    loadAllPlugins();
+    loadPlugins();
 }
 
 
@@ -79,7 +79,7 @@ Message MessageProcessor::processOutgoingMessage(const Tp::Message &sentMessage)
     return message;
 }
 
-void MessageProcessor::loadAllPlugins() {
+void MessageProcessor::loadPlugins() {
     kDebug() << "Starting loading filters...";
 
     Q_FOREACH (const KPluginInfo &plugin, pluginList()) {
diff --git a/KTp/message-processor.h b/KTp/message-processor.h
index f07a13e..5ead255 100644
--- a/KTp/message-processor.h
+++ b/KTp/message-processor.h
@@ -54,7 +54,7 @@ protected:
     explicit MessageProcessor();
 
 private:
-    void loadAllPlugins();
+    void loadPlugins();
     static MessageProcessor* s_instance;
     QList<AbstractMessageFilter*> m_filters;
 

-- 
ktp-common-internals packaging