Attachment 127183 Details for Bug 247903

[patch] cancel connection properly

cancelconnection.diff (text/plain), 1.70 KB, created by Will Stephenson on 2007-03-28 20:32:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Stephenson

Created: 2007-03-28 20:32:11 UTC

Size: 1.70 KB

patch

obsolete

>Index: kmail/imapaccountbase.cpp
>===================================================================
>--- kmail/imapaccountbase.cpp	(revision 647532)
>+++ kmail/imapaccountbase.cpp	(working copy)
>@@ -550,19 +550,19 @@
>     if (aSlave != mSlave) return;
>     handleError( errorCode, errorMsg, 0, QString::null, true );
>     if ( mAskAgain )
>-      makeConnection();
>-    else {
>-      if ( !mSlaveConnected ) {
>-        mSlaveConnectionError = true;
>-        resetConnectionList( this );
>-        if ( mSlave )
>-        {
>-          KIO::Scheduler::disconnectSlave( slave() );
>-          mSlave = 0;
>-        }
>+      if ( makeConnection() != ImapAccountBase::Error )
>+        return;
>+
>+    if ( !mSlaveConnected ) {
>+      mSlaveConnectionError = true;
>+      resetConnectionList( this );
>+      if ( mSlave )
>+      {
>+        KIO::Scheduler::disconnectSlave( slave() );
>+        mSlave = 0;
>       }
>-      emit connectionResult( errorCode, errorMsg );
>     }
>+    emit connectionResult( errorCode, errorMsg );
>   }
> 
>   //-----------------------------------------------------------------------------
>@@ -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;

Actions: View | Diff

Attachments on bug 247903: 127183 | 127184