From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sat, 17 Jan 2015 10:41:00 +0000 (+0000)
Subject: tlscancelled
X-Git-Tag: archive/raspbian/4%18.08.3-6+rpi1^2^2^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e7a728eb24895c1269b4eeb011a5a30fde02251f;p=kdepim-runtime.git

tlscancelled


Gbp-Pq: Name tlscancelled.patch
---

diff --git a/resources/imap/sessionpool.cpp b/resources/imap/sessionpool.cpp
index c94069b1..8cf1b3f2 100644
--- a/resources/imap/sessionpool.cpp
+++ b/resources/imap/sessionpool.cpp
@@ -377,6 +377,11 @@ void SessionPool::onLoginDone( KJob *job )
                                i18n( "Could not connect to the IMAP-server.\n%1",
                                      job->errorString() ) );
       }
+    } else if ( job->error() == KIMAP::LoginJob::ERR_SSL_FAILED ) {
+      cancelSessionCreation( login->session(),
+                             EncryptionError,
+                             i18n( "Could not connect to the IMAP-server %1.\n%2",
+                                   m_account->server(), job->errorString() ) );
     } else {
       // Connection worked, but login failed -> ask for a different password or ssl settings.
       m_pendingInitialSession = login->session();