Attachment 127184 Details for Bug 247903

[patch] remove the need to cancel the password dialog when failing due to no SSL/TLS support

changeimaperror.diff (text/plain), 1.75 KB, created by Will Stephenson on 2007-03-28 20:33:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Stephenson

Created: 2007-03-28 20:33:03 UTC

Size: 1.75 KB

patch

obsolete

>Index: kmail/imapaccountbase.cpp
>===================================================================
>--- kmail/imapaccountbase.cpp	(revision 647532)
>+++ kmail/imapaccountbase.cpp	(working copy)
>@@ -880,7 +880,7 @@
>     bool jobsKilled = true;
>     switch( errorCode ) {
>     case KIO::ERR_SLAVE_DIED: slaveDied(); killAllJobs( true ); break;
>-    case KIO::ERR_COULD_NOT_LOGIN: // bad password
>+    case KIO::ERR_COULD_NOT_AUTHENTICATE: // bad password
>       mAskAgain = true;
>       // fallthrough intended
>     case KIO::ERR_CONNECTION_BROKEN:
>@@ -889,6 +889,7 @@
>       // These mean that we'll have to reconnect on the next attempt, so disconnect and set mSlave to 0.
>       killAllJobs( true );
>       break;
>+    case KIO::ERR_COULD_NOT_LOGIN:
>     case KIO::ERR_USER_CANCELED:
>       killAllJobs( false );
>       break;
>Index: kioslaves/imap4/imap4.cc
>===================================================================
>--- kioslaves/imap4/imap4.cc	(revision 647532)
>+++ kioslaves/imap4/imap4.cc	(working copy)
>@@ -2020,14 +2020,14 @@
>         }
>       }
>       if (!clientLogin (myUser, myPass, resultInfo))
>-        error(KIO::ERR_COULD_NOT_LOGIN, i18n("Unable to login. Probably the "
>+        error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
>         "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo));
>     }
>     else
>     {
> #ifdef HAVE_LIBSASL2
>       if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo))
>-        error(KIO::ERR_COULD_NOT_LOGIN, i18n("Unable to authenticate via %1.\n"
>+        error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
> 	"The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
>       else {
>         myUser = authInfo.username;

Actions: View | Diff

Attachments on bug 247903: 127183 | 127184