[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim
From:       Volker Krause <volker.krause () rwth-aachen ! de>
Date:       2005-02-20 15:54:18
Message-ID: 20050220155418.246271B912 () office ! kde ! org
[Download RAW message or body]

CVS commit by vkrause: 

If the user cancels the wallet password prompt, remember this decision and don't ask \
again for every account.


  M +5 -2      kmail/kmkernel.cpp   1.328
  M +5 -2      knode/knserverinfo.cpp   1.32


--- kdepim/kmail/kmkernel.cpp  #1.327:1.328
@@ -1927,8 +1927,9 @@ int KMKernel::timeOfLastMessageCountChan
 
 Wallet *KMKernel::wallet() {
+  static bool walletOpenFailed = false;
   if ( mWallet && mWallet->isOpen() )
     return mWallet;
 
-  if ( !Wallet::isEnabled() )
+  if ( !Wallet::isEnabled() || walletOpenFailed )
     return 0;
 
@@ -1937,6 +1938,8 @@ Wallet *KMKernel::wallet() {
         getKMMainWidget() ? getKMMainWidget()->topLevelWidget()->winId() : 0 );
 
-  if ( !mWallet )
+  if ( !mWallet ) {
+    walletOpenFailed = true;
     return 0;
+  }
 
   if ( !mWallet->hasFolder( "kmail" ) )

--- kdepim/knode/knserverinfo.cpp  #1.31:1.32
@@ -155,8 +155,9 @@ Wallet* KNServerInfo::mWallet = 0;
 Wallet* KNServerInfo::wallet()
 {
+  static bool walletOpenFailed = false;
   if (mWallet && mWallet->isOpen())
     return mWallet;
 
-  if (!Wallet::isEnabled())
+  if (!Wallet::isEnabled() || walletOpenFailed)
     return 0;
 
@@ -169,6 +170,8 @@ Wallet* KNServerInfo::wallet()
     sd.setObject( mWallet, Wallet::openWallet(Wallet::NetworkWallet()) );
 
-  if (!mWallet)
+  if (!mWallet) {
+    walletOpenFailed = true;
     return 0;
+  }
 
   if (mWallet && !mWallet->hasFolder("knode"))


[prev in list] [next in list] [prev in thread] [next in thread]