From kde-commits  Sun Feb 20 13:40:13 2005
From: Volker Krause <volker.krause () rwth-aachen ! de>
Date: Sun, 20 Feb 2005 13:40:13 +0000
To: kde-commits
Subject: kdepim
Message-Id: <20050220134013.C53121BB62 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=110890682114907

CVS commit by vkrause: 

We get here if the user canceled the wallet password dialog, so the message "This error is most probably caused by providing a wrong password." is at least misleading, wrong passwords are handled by KWallet itself.


  M +1 -4      kmail/kmkernel.cpp   1.327
  M +1 -4      knode/knserverinfo.cpp   1.31


--- kdepim/kmail/kmkernel.cpp  #1.326:1.327
@@ -1937,9 +1937,6 @@ Wallet *KMKernel::wallet() {
         getKMMainWidget() ? getKMMainWidget()->topLevelWidget()->winId() : 0 );
 
-  if ( !mWallet ) {
-    KMessageBox::error( getKMMainWidget(), i18n("The wallet could not be opened. "
-        "This error is most probably caused by providing a wrong password.") );
+  if ( !mWallet )
     return 0;
-  }
 
   if ( !mWallet->hasFolder( "kmail" ) )

--- kdepim/knode/knserverinfo.cpp  #1.30:1.31
@@ -169,9 +169,6 @@ Wallet* KNServerInfo::wallet()
     sd.setObject( mWallet, Wallet::openWallet(Wallet::NetworkWallet()) );
 
-  if (!mWallet) {
-    KMessageBox::error(knGlobals.topWidget, i18n("The wallet could not be opened. "
-        "This error is most probably caused by providing a wrong password."));
+  if (!mWallet)
     return 0;
-  }
 
   if (mWallet && !mWallet->hasFolder("knode"))