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

The following commit has been merged in the master branch:
commit dad5b62e6c4a233cd24b6ece333599c6ae0f3715
Author: Lasath Fernando <kde at lasath.org>
Date:   Sun Jul 15 00:26:29 2012 +1000

    Address George K's issues in review
---
 config/messages-config.cpp    |  2 +-
 lib/message-processor.cpp     | 13 +++++--------
 lib/plugin-config-manager.cpp | 14 ++++++--------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/config/messages-config.cpp b/config/messages-config.cpp
index 92f8286..fd79b56 100644
--- a/config/messages-config.cpp
+++ b/config/messages-config.cpp
@@ -28,7 +28,7 @@
 #include <KDebug>
 
 K_PLUGIN_FACTORY(KTpMessagesConfigFactory, registerPlugin<MessagesConfig>();)
-K_EXPORT_PLUGIN(KTpMessagesConfigFactory("kcm_ktp_message_filters", "kcm_ktp_chat_messages"))
+K_EXPORT_PLUGIN(KTpMessagesConfigFactory("ktp_chat_messages", "kcm_ktp_chat_messages"))
 
 MessagesConfig::MessagesConfig(QWidget *parent, const QVariantList &args)
     : PluginPage(KTpMessagesConfigFactory::componentData(), parent, args)
diff --git a/lib/message-processor.cpp b/lib/message-processor.cpp
index 41213c8..09ab98e 100644
--- a/lib/message-processor.cpp
+++ b/lib/message-processor.cpp
@@ -29,21 +29,18 @@
 #include <KPluginFactory>
 
 MessageProcessor* MessageProcessor::s_instance = 0;
-static const QString serviceType = QLatin1String("KTpTextUi/MessageFilter");
 
 MessageProcessor* MessageProcessor::instance()
 {
     kDebug();
 
     static QMutex mutex;
-    if (!s_instance)
-    {
-        mutex.lock();
-        if (!s_instance) {
-            s_instance = new MessageProcessor;
-        }
-        mutex.unlock();
+    mutex.lock();
+    if (!s_instance) {
+        s_instance = new MessageProcessor;
     }
+    mutex.unlock();
+
     return s_instance;
 }
 
diff --git a/lib/plugin-config-manager.cpp b/lib/plugin-config-manager.cpp
index c3c828b..b1a4d5b 100644
--- a/lib/plugin-config-manager.cpp
+++ b/lib/plugin-config-manager.cpp
@@ -35,16 +35,14 @@ public:
 
 PluginConfigManager *PluginConfigManager::self()
 {
-    static PluginConfigManager *pcm_instance = new PluginConfigManager();
+    static PluginConfigManager *pcm_instance;
     static QMutex mutex;
-    if (!pcm_instance)
-    {
-        mutex.lock();
-        if (!pcm_instance) {
-            pcm_instance = new PluginConfigManager;
-        }
-        mutex.unlock();
+    mutex.lock();
+    if (!pcm_instance) {
+        pcm_instance = new PluginConfigManager;
     }
+    mutex.unlock();
+
     return pcm_instance;
 }
 

-- 
ktp-text-ui packaging