[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bkdepim=5D_kleopatra/conf=3A_SMIMEValidationConfigur?=
From: Marc Mutz <mutz () kde ! org>
Date: 2011-01-27 19:04:08
Message-ID: 20110127190408.2CC26A6094 () git ! kde ! org
[Download RAW message or body]
Git commit 9664a15890669bc17af82d09e398e28320469249 by Marc Mutz.
Pushed by tnyblom into branch 'master'.
SMIMEValidationConfigurationWidget: hide the checkbox for allow-mark-trusted when no-allow-mark-trusted \
is found
M +5 -0 kleopatra/conf/smimevalidationconfigurationwidget.cpp
http://commits.kde.org/ee6cc38b/9664a15890669bc17af82d09e398e28320469249
diff --git a/kleopatra/conf/smimevalidationconfigurationwidget.cpp \
b/kleopatra/conf/smimevalidationconfigurationwidget.cpp index 351bff2..1c2a157 100644
--- a/kleopatra/conf/smimevalidationconfigurationwidget.cpp
+++ b/kleopatra/conf/smimevalidationconfigurationwidget.cpp
@@ -148,6 +148,7 @@ struct SMIMECryptoConfigEntries {
mDoNotCheckCertPolicyConfigEntry( configEntry( "gpgsm", "Security", "disable-policy-checks", \
CryptoConfigEntry::ArgType_None, false ) ),
mNeverConsultConfigEntry( configEntry( "gpgsm", "Security", "disable-crl-checks", \
CryptoConfigEntry::ArgType_None, false ) ),
mAllowMarkTrustedConfigEntry( configEntry( "gpg-agent", "Security", "allow-mark-trusted", \
CryptoConfigEntry::ArgType_None, false ) ), + mNoAllowMarkTrustedConfigEntry( configEntry( \
"gpg-agent", "Security", "no-allow-mark-trusted", CryptoConfigEntry::ArgType_None, false \
) ),
mFetchMissingConfigEntry( configEntry( "gpgsm", "Security", "auto-issuer-key-retrieve", \
CryptoConfigEntry::ArgType_None, false ) ), // dirmngr-0.9.0 options
mIgnoreServiceURLEntry( configEntry( "dirmngr", "OCSP", "ignore-ocsp-service-url", \
CryptoConfigEntry::ArgType_None, false ) ), @@ -180,6 +181,8 @@ struct SMIMECryptoConfigEntries {
CryptoConfigEntry * const mNeverConsultConfigEntry;
CryptoConfigEntry * const mAllowMarkTrustedConfigEntry;
CryptoConfigEntry * const mFetchMissingConfigEntry;
+ // gnupg 2.0.17+ option that should inhibit allow-mark-trusted display
+ CryptoConfigEntry * const mNoAllowMarkTrustedConfigEntry;
// dirmngr-0.9.0 options
CryptoConfigEntry * const mIgnoreServiceURLEntry;
CryptoConfigEntry * const mIgnoreHTTPDPEntry;
@@ -242,6 +245,8 @@ void SMimeValidationConfigurationWidget::load() {
d->ui.doNotCheckCertPolicyCB->setChecked( e.mDoNotCheckCertPolicyConfigEntry->boolValue() );
if ( e.mNeverConsultConfigEntry )
d->ui.neverConsultCB->setChecked( e.mNeverConsultConfigEntry->boolValue() );
+ if ( e.mNoAllowMarkTrustedConfigEntry )
+ d->ui.allowMarkTrustedCB->hide(); // this option was only here to _enable_ allow-mark-trusted, \
and makes no sense if it's already default on if ( e.mAllowMarkTrustedConfigEntry )
d->ui.allowMarkTrustedCB->setChecked( e.mAllowMarkTrustedConfigEntry->boolValue() );
if ( e.mFetchMissingConfigEntry )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic