Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
libksieve
Commits
06f4b1bb
Commit
06f4b1bb
authored
Jul 28, 2022
by
Laurent Montel
Browse files
We depend against kf5.96
parent
7007ba3f
Pipeline
#210012
passed with stage
in 11 minutes and 31 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
kioslave/src/sieve/sieve.cpp
View file @
06f4b1bb
...
...
@@ -18,7 +18,6 @@
#include
"sieve.h"
#include
"../common.h"
#include
"sieve_debug.h"
#include
<kio_version.h>
extern
"C"
{
#include
<sasl/sasl.h>
...
...
@@ -346,11 +345,7 @@ bool kio_sieveProtocol::connect(bool useTLSIfAvailable)
// Attempt to start TLS
if
(
!
m_allowUnencrypted
&&
!
QSslSocket
::
supportsSsl
())
{
#if KIO_VERSION >= QT_VERSION_CHECK(5, 96, 0)
error
(
KIO
::
ERR_WORKER_DEFINED
,
i18n
(
"Can not use TLS since the underlying Qt library does not support it."
));
#else
error
(
ERR_SLAVE_DEFINED
,
i18n
(
"Can not use TLS since the underlying Qt library does not support it."
));
#endif
disconnect
();
return
false
;
}
...
...
@@ -393,15 +388,9 @@ bool kio_sieveProtocol::connect(bool useTLSIfAvailable)
}
else
if
(
!
m_allowUnencrypted
)
{
ksDebug
<<
"Server incapable of TLS."
;
disconnect
();
#if KIO_VERSION >= QT_VERSION_CHECK(5, 96, 0)
error
(
KIO
::
ERR_WORKER_DEFINED
,
i18n
(
"The server does not seem to support TLS. "
"Disable TLS if you want to connect without encryption."
));
#else
error
(
ERR_SLAVE_DEFINED
,
i18n
(
"The server does not seem to support TLS. "
"Disable TLS if you want to connect without encryption."
));
#endif
return
false
;
}
else
{
ksDebug
<<
"Server incapable of TLS. Transmitted documents will be unencrypted."
<<
returnEndLine
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment