talons

commit fe89b3a7fbcefc21dcf195929c948bd8be603788
parent b0a0fd75fb84a8bfffebc945faa241b06feb91bf
Author: Paul <paul@claws-mail.org>
Date:   Tue, 24 Jun 2014 11:39:04 +0100

fix erroneous 'untrusted' msg based on validity not trust

Diffstat:
M
src/plugins/pgpcore/sgpgme.c
 | 
14
+-------------

1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
@@ -209,19 +209,7 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
 		uname = g_strdup("<?>");
 	switch (gpg_err_code(sig->status)) {
 	case GPG_ERR_NO_ERROR:
-		switch (gpg_err_code(sig->validity)) {
-		case GPGME_VALIDITY_FULL:
-		case GPGME_VALIDITY_ULTIMATE:
-			result = g_strdup_printf(_("Good signature from %s."), uname);
-			break;
-		case GPGME_VALIDITY_MARGINAL:
-		case GPGME_VALIDITY_UNKNOWN:
-		case GPGME_VALIDITY_UNDEFINED:
-		case GPGME_VALIDITY_NEVER:
-		default:
-			result = g_strdup_printf(_("Good signature (untrusted) from %s."), uname);
-			break;
-		}
+		result = g_strdup_printf(_("Good signature from %s."), uname);
 		break;
 	case GPG_ERR_SIG_EXPIRED:
 		result = g_strdup_printf(_("Expired signature from %s."), uname);