File fix-blocking-dialog.diff of Package kdepim3

Overview Repositories Revisions Requests Users Attributes Meta

File fix-blocking-dialog.diff of Package kdepim3

Index: imapaccountbase.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/imapaccountbase.cpp,v
retrieving revision 1.119
diff -u -p -r1.119 imapaccountbase.cpp
--- kmail/imapaccountbase.cpp	16 Feb 2005 21:02:39 -0000	1.119
+++ kmail/imapaccountbase.cpp	18 Mar 2005 10:08:44 -0000
@@ -244,16 +244,18 @@ namespace KMail {
       // "keep password" checkbox. Then, we set [Passwords]Keep to
       // storePasswd(), so that the checkbox in the dialog will be
       // init'ed correctly:
-      bool store = true;
       KConfigGroup passwords( KGlobal::config(), "Passwords" );
       passwords.writeEntry( "Keep", storePasswd() );
       QString msg = i18n("You need to supply a username and a password to "
 			 "access this mailbox.");
       mPasswordDialogIsActive = true;
-      if ( PasswordDialog::getNameAndPassword( log, pass, &store, msg, false,
-					       QString::null, name(),
-					       i18n("Account:") )
-          != QDialog::Accepted ) {
+      
+      PasswordDialog* dlg = new PasswordDialog( msg, log, true /* store pw */, true, kapp->activeWindow() );
+      dlg->setPlainCaption( i18n("Authorization Dialog") );
+      dlg->addCommentLine( i18n("Account:"), name() );
+      int ret = dlg->exec();
+      if (ret != QDialog::Accepted ) {
+        delete dlg;
         mPasswordDialogIsActive = false;
         mAskAgain = false;
         emit connectionResult( KIO::ERR_USER_CANCELED, QString::null );
@@ -262,9 +264,10 @@ namespace KMail {
       mPasswordDialogIsActive = false;
       // The user has been given the chance to change login and
       // password, so copy both from the dialog:
-      setPasswd( pass, store );
-      setLogin( log );
+      setPasswd( dlg->password(), dlg->keepPassword() );
+      setLogin( dlg->username() );
       mAskAgain = false;
+      delete dlg;
     }
     // already waiting for a connection?
     if ( mSlave && !mSlaveConnected ) return Connecting;

Places

File fix-blocking-dialog.diff of Package kdepim3

Places