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

The following commit has been merged in the master branch:
commit ed4716edab4e698be3900dc49ec6fd7ce7804baf
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu May 17 22:00:12 2012 +0100

    Connect to wallet on constructor of WalletInterfacePrivate, not a method that is never called
    
    Reviewed-by: Martin Klapetek
---
 KTp/wallet-interface.cpp | 9 +++------
 KTp/wallet-interface.h   | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/KTp/wallet-interface.cpp b/KTp/wallet-interface.cpp
index 21c491e..d2dc2cb 100644
--- a/KTp/wallet-interface.cpp
+++ b/KTp/wallet-interface.cpp
@@ -27,6 +27,7 @@
 class KTp::WalletInterfacePrivate
 {
 public:
+    WalletInterfacePrivate();
     QScopedPointer<KWallet::Wallet> wallet;
     static const QLatin1String folderName;
     static const QLatin1String mapsPrefix;
@@ -40,12 +41,8 @@ const QLatin1String WalletInterfacePrivate::mapsPrefix = QLatin1String("maps/");
 
 K_GLOBAL_STATIC(KTp::WalletInterfacePrivate, instance)
 
-WalletInterface::WalletInterface(WId winId)
-{
-    instance->wallet.reset(KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), winId));
-}
-
-WalletInterface::~WalletInterface()
+WalletInterfacePrivate::WalletInterfacePrivate() :
+    wallet(KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0))
 {
 }
 
diff --git a/KTp/wallet-interface.h b/KTp/wallet-interface.h
index 21b25b3..c43fb38 100644
--- a/KTp/wallet-interface.h
+++ b/KTp/wallet-interface.h
@@ -75,7 +75,7 @@ public:
     static bool isOpen();
 
 private:
-    WalletInterface(WId winId=0);
+    WalletInterface();
     virtual ~WalletInterface();
 };
 

-- 
ktp-common-internals packaging