View | Details | Raw Unified | Return to bug 247903
Collapse All | Expand All

(-)kmail/imapaccountbase.cpp (-1 / +2 lines)
Lines 880-886 Link Here
880 
    bool jobsKilled = true;
 880 
    bool jobsKilled = true;
881 
    switch( errorCode ) {
 881 
    switch( errorCode ) {
882 
    case KIO::ERR_SLAVE_DIED: slaveDied(); killAllJobs( true ); break;
 882 
    case KIO::ERR_SLAVE_DIED: slaveDied(); killAllJobs( true ); break;
883 
    case KIO::ERR_COULD_NOT_LOGIN: // bad password
 883 
    case KIO::ERR_COULD_NOT_AUTHENTICATE: // bad password
884 
      mAskAgain = true;
 884 
      mAskAgain = true;
885 
      // fallthrough intended
 885 
      // fallthrough intended
886 
    case KIO::ERR_CONNECTION_BROKEN:
 886 
    case KIO::ERR_CONNECTION_BROKEN:
Lines 889-894 Link Here
889 
      // These mean that we'll have to reconnect on the next attempt, so disconnect and set mSlave to 0.
 889 
      // These mean that we'll have to reconnect on the next attempt, so disconnect and set mSlave to 0.
890 
      killAllJobs( true );
 890 
      killAllJobs( true );
891 
      break;
 891 
      break;
892 
    case KIO::ERR_COULD_NOT_LOGIN:
892 
    case KIO::ERR_USER_CANCELED:
 893 
    case KIO::ERR_USER_CANCELED:
893 
      killAllJobs( false );
 894 
      killAllJobs( false );
894 
      break;
 895 
      break;
(-)kioslaves/imap4/imap4.cc (-2 / +2 lines)
Lines 2020-2033 Link Here
2020 
        }
 2020 
        }
2021 
      }
 2021 
      }
2022 
      if (!clientLogin (myUser, myPass, resultInfo))
 2022 
      if (!clientLogin (myUser, myPass, resultInfo))
2023 
        error(KIO::ERR_COULD_NOT_LOGIN, i18n("Unable to login. Probably the "
 2023 
        error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
2024 
        "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo));
 2024 
        "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo));
2025 
    }
 2025 
    }
2026 
    else
 2026 
    else
2027 
    {
 2027 
    {
2028 
#ifdef HAVE_LIBSASL2
 2028 
#ifdef HAVE_LIBSASL2
2029 
      if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo))
 2029 
      if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo))
2030 
        error(KIO::ERR_COULD_NOT_LOGIN, i18n("Unable to authenticate via %1.\n"
 2030 
        error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
2031 
	"The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
 2031 
	"The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
2032 
      else {
 2032 
      else {
2033 
        myUser = authInfo.username;
 2033 
        myUser = authInfo.username;

Return to bug 247903