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

The following commit has been merged in the master branch:
commit b87a725b4e0e27d7280184de53b559b017641247
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Sep 24 23:25:56 2012 +0100

    Fix a bug in which the PendingWallet would hang forever if the wallet system is disabled
    
    This fixes bugs in the auth handler and AccountsKCM
    
    BUG: 307237 (auth handler blocks and does nothing)
    BUG: 307302 (accounts KCM crashes)
    BUG: 306953 (accounts KCM crashes)
---
 KTp/pending-wallet.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/KTp/pending-wallet.cpp b/KTp/pending-wallet.cpp
index c8680b9..5006b7f 100644
--- a/KTp/pending-wallet.cpp
+++ b/KTp/pending-wallet.cpp
@@ -32,7 +32,9 @@ KTp::PendingWallet::PendingWallet(KTp::WalletInterface* walletInterface)
       d( new KTp::PendingWalletPrivate())
 {
     d->walletInterface = walletInterface;
-    if (walletInterface->isOpen()) {
+
+    //if wallet is not enabled, or wallet is already opened, setFinished() immediately
+    if (!walletInterface->wallet() || walletInterface->isOpen()) {
         setFinished();
     } else {
         connect(walletInterface->wallet(), SIGNAL(walletOpened(bool)), SLOT(setFinished()));

-- 
ktp-common-internals packaging