[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=8e95d56

The following commit has been merged in the master branch:
commit 8e95d56b6d95629d8a41c61ef59497f640d20e2b
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Mar 21 15:37:33 2012 +0100

    Do not call loadStyle in ChatWindowStyleManager constructor
    
    This fixes a race condition between adiumxtra-handler and the KDirLister that
    can cause a SIGSEGV
---
 adiumxtra-protocol-handler/chat-style-installer.cpp | 1 +
 lib/chat-window-style-manager.cpp                   | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/adiumxtra-protocol-handler/chat-style-installer.cpp b/adiumxtra-protocol-handler/chat-style-installer.cpp
index 5e0cf65..38862ed 100644
--- a/adiumxtra-protocol-handler/chat-style-installer.cpp
+++ b/adiumxtra-protocol-handler/chat-style-installer.cpp
@@ -27,6 +27,7 @@
 #include <KLocale>
 #include <KNotification>
 #include <KApplication>
+#include <QTimer>
 
 
 ChatStyleInstaller::ChatStyleInstaller(KArchive *archive, KTemporaryFile *tmpFile)
diff --git a/lib/chat-window-style-manager.cpp b/lib/chat-window-style-manager.cpp
index 29eb47d..47f7a6f 100644
--- a/lib/chat-window-style-manager.cpp
+++ b/lib/chat-window-style-manager.cpp
@@ -46,8 +46,6 @@ public:
 
     ~Private() {
         if (styleDirLister) {
-            q->disconnect(styleDirLister, SIGNAL(newItems(KFileItemList)), q, SLOT(slotNewStyles(KFileItemList)));
-            q->disconnect(styleDirLister, SIGNAL(completed()), q, SLOT(slotDirectoryFinished()));
             styleDirLister->deleteLater();
         }
 
@@ -74,7 +72,6 @@ ChatWindowStyleManager::ChatWindowStyleManager(QObject *parent)
         : QObject(parent), d(new Private(this))
 {
     kDebug() ;
-    loadStyles();
 }
 
 ChatWindowStyleManager::~ChatWindowStyleManager()

-- 
ktp-text-ui packaging