Work around a bug in Wallet::keyDoesNotExist().

Fixes problems with the migration from passwords to the wallet.

CCMAIL: 76097@bugs.kde.org

svn path=/trunk/kdepim/; revision=343458

kmtransport.cpp

@@ -199,7 +199,10 @@ void KMTransportInfo::readPassword() const
   if ( !storePasswd() || !auth )
     return;
 
-  if ( Wallet::folderDoesNotExist(Wallet::NetworkWallet(), "kmail") ||
+  // ### workaround for broken Wallet::keyDoesNotExist() which returns wrong
+  // results for new entries without closing and reopening the wallet
+  if ( Wallet::isOpen( Wallet::NetworkWallet() ) ?
+       !kmkernel->wallet()->hasEntry( "transport-" + QString::number(mId) ) :
        Wallet::keyDoesNotExist( Wallet::NetworkWallet(), "kmail", "transport-" + QString::number(mId) ) )
     return;
 

networkaccount.cpp

@@ -258,8 +258,11 @@ namespace KMail {
     if ( !storePasswd() )
       return;
 
-    if ( Wallet::folderDoesNotExist( Wallet::NetworkWallet(), "kmail" ) ||
-          Wallet::keyDoesNotExist( Wallet::NetworkWallet(), "kmail", "account-" + QString::number(mId) ) )
+    // ### workaround for broken Wallet::keyDoesNotExist() which returns wrong
+    // results for new entries without closing and reopening the wallet
+    if ( Wallet::isOpen( Wallet::NetworkWallet() ) ?
+         !kmkernel->wallet()->hasEntry( "account-" + QString::number(mId) ) :
+         Wallet::keyDoesNotExist( Wallet::NetworkWallet(), "kmail", "account-" + QString::number(mId) ) )
       return;
 
     if ( kmkernel->wallet() ) {