From b85cbb139e63d97b646aca22866aa1e440b386c8 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 18 Feb 2004 16:20:19 +0000 Subject: Use the trust to decide the validity signature status. (Better way of 2004-02-18 Jeffrey Stedfast * camel-gpg-context.c (gpg_verify): Use the trust to decide the validity signature status. (Better way of solving yesterday's problem) * camel-cipher-context.h: Revert change from yesterday. svn path=/trunk/; revision=24779 --- camel/camel-gpg-context.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'camel/camel-gpg-context.c') diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index ca235bd0d1..306211ab99 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -1441,9 +1441,14 @@ gpg_verify (CamelCipherContext *context, CamelMimePart *ipart, CamelException *e valid = gpg_ctx_op_wait (gpg) == 0; validity = camel_cipher_validity_new (); diagnostics = gpg_ctx_get_diagnostics (gpg); - camel_cipher_validity_set_valid (validity, valid); camel_cipher_validity_set_description (validity, diagnostics); - validity->sign.trust = gpg->trust; + if (valid && gpg->trust > GPG_TRUST_NEVER) { + if (gpg->trust == GPG_TRUST_UNDEFINED) + validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_UNKNOWN; + else + validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_GOOD; + } else + validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_BAD; gpg_ctx_free (gpg); if (sigfile) { -- cgit v1.2.3