[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/kdepim/enterprise4/kdepim/kleopatra/conf
From: Marc Mutz <mutz () kde ! org>
Date: 2011-01-27 18:46:55
Message-ID: 20110127184655.47505AC8BA () svn ! kde ! org
[Download RAW message or body]
SVN commit 1217518 by mutz:
SMIMEValidationConfigurationWidget: hide the checkbox for allow-mark-trusted when \
no-allow-mark-trusted is found
M +5 -0 smimevalidationconfigurationwidget.cpp
--- branches/kdepim/enterprise4/kdepim/kleopatra/conf/smimevalidationconfigurationwidget.cpp \
#1217517:1217518 @@ -148,6 +148,7 @@
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 @@ 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 @@
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