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
KMail
Commits
70119b48
Commit
70119b48
authored
Oct 21, 2022
by
Sandro Knauß
🐝
Browse files
Adopt removal of encryptToSelf.
parent
813fab30
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
70119b48
...
...
@@ -69,7 +69,7 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branc
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED DBus Network Test Widgets WebEngineWidgets
)
set
(
LIBGRAVATAR_VERSION
"5.21.40"
)
set
(
MAILCOMMON_LIB_VERSION
"5.21.41"
)
set
(
MESSAGELIB_LIB_VERSION
"5.21.4
2
"
)
set
(
MESSAGELIB_LIB_VERSION
"5.21.4
3
"
)
set
(
LIBKLEO_LIB_VERSION
"5.21.40"
)
set
(
PIMCOMMON_LIB_VERSION
"5.21.41"
)
set
(
LIBKDEPIM_LIB_VERSION
"5.21.40"
)
...
...
src/editor/kmcomposerwin.cpp
View file @
70119b48
...
...
@@ -2061,11 +2061,6 @@ void KMComposerWin::autoSaveMessage(bool force)
}
}
bool
KMComposerWin
::
encryptToSelf
()
const
{
return
MessageComposer
::
MessageComposerSettings
::
self
()
->
cryptoEncryptToSelf
();
}
void
KMComposerWin
::
slotSendFailed
(
const
QString
&
msg
,
MessageComposer
::
ComposerViewBase
::
FailedType
type
)
{
setEnabled
(
true
);
...
...
@@ -2531,7 +2526,7 @@ void KMComposerWin::setEncryption(bool encrypt, bool setByUser)
}
// check if the user wants to encrypt messages to himself and if he defined
// an encryption key for the current identity
else
if
(
encrypt
&&
encryptToSelf
()
&&
!
mLastIdentityHasEncryptionKey
)
{
else
if
(
encrypt
&&
!
mLastIdentityHasEncryptionKey
)
{
if
(
setByUser
)
{
KMessageBox
::
error
(
this
,
i18n
(
"<qt><p>You have requested that messages be "
...
...
src/editor/kmcomposerwin.h
View file @
70119b48
...
...
@@ -554,8 +554,6 @@ private:
// helper method for rethinkFields
Q_REQUIRED_RESULT
int
calcColumnWidth
(
int
which
,
long
allShowing
,
int
width
)
const
;
Q_REQUIRED_RESULT
inline
bool
encryptToSelf
()
const
;
private:
enum
CryptoKeyState
{
NoState
=
0
,
...
...
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