summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2016-07-21 10:58:12 (GMT)
committerDaniel Vrátil <dvratil@kde.org>2016-07-22 12:33:33 (GMT)
commit01df5060d7771b60fb4923da495e1f44f2df42fc (patch)
treef1901eea9afd88d9d1441ed6b472a89461a324fa
parent062461f11c67047bb05cecde6bf5b40722d15d37 (diff)
Remove global pgp-auto-encrypt config option
Use a per-identity crypto configuration instead. Differential Revision: https://phabricator.kde.org/D2245
-rw-r--r--CMakeLists.txt4
-rw-r--r--messagecomposer/src/composer/composerviewbase.cpp4
-rw-r--r--messagecomposer/src/settings/messagecomposer.kcfg.cmake3
3 files changed, 4 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f59e79..7e3ba8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(PIM_VERSION "5.3.41")
+set(PIM_VERSION "5.3.42")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.2.80")
@@ -29,7 +29,7 @@ set(AKONADI_VERSION "5.2.80")
set(AKONADINOTES_LIB_VERSION "5.2.80")
set(GRANTLEETHEME_LIB_VERSION "5.2.80")
set(GRAVATAR_LIB_VERSION "5.2.80")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.80")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.3.41")
set(KCONTACTS_LIB_VERSION "5.2.80")
set(KDEPIM_APPS_LIB_VERSION "5.2.80")
set(KLDAP_LIB_VERSION "5.2.80")
diff --git a/messagecomposer/src/composer/composerviewbase.cpp b/messagecomposer/src/composer/composerviewbase.cpp
index 3f4627c..338fdb7 100644
--- a/messagecomposer/src/composer/composerviewbase.cpp
+++ b/messagecomposer/src/composer/composerviewbase.cpp
@@ -594,11 +594,12 @@ inline bool showKeyApprovalDialog()
QList< MessageComposer::Composer * > MessageComposer::ComposerViewBase::generateCryptoMessages(bool &wasCanceled)
{
+ const KIdentityManagement::Identity &id = m_identMan->identityForUoidOrDefault(m_identityCombo->currentIdentity());
qCDebug(MESSAGECOMPOSER_LOG) << "filling crypto info";
Kleo::KeyResolver *keyResolver = new Kleo::KeyResolver(encryptToSelf(),
showKeyApprovalDialog(),
- MessageComposer::MessageComposerSettings::self()->pgpAutoEncrypt(),
+ id.pgpAutoEncrypt(),
m_cryptoMessageFormat,
encryptKeyNearExpiryWarningThresholdInDays(),
signingKeyNearExpiryWarningThresholdInDays(),
@@ -607,7 +608,6 @@ QList< MessageComposer::Composer * > MessageComposer::ComposerViewBase::generate
encryptChainCertNearExpiryWarningThresholdInDays(),
signingChainCertNearExpiryWarningThresholdInDays());
- const KIdentityManagement::Identity &id = m_identMan->identityForUoidOrDefault(m_identityCombo->currentIdentity());
QStringList encryptToSelfKeys;
QStringList signKeys;
diff --git a/messagecomposer/src/settings/messagecomposer.kcfg.cmake b/messagecomposer/src/settings/messagecomposer.kcfg.cmake
index c1abc5f..bdc3461 100644
--- a/messagecomposer/src/settings/messagecomposer.kcfg.cmake
+++ b/messagecomposer/src/settings/messagecomposer.kcfg.cmake
@@ -147,9 +147,6 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/sta
<label>Always show the list of encryption keys to select the one which will be used</label>
<default>true</default>
</entry>
- <entry name="PgpAutoEncrypt" type="Bool" key="pgp-auto-encrypt">
- <default>false</default>
- </entry>
</group>
<group name="sending mail">