fix erroneous 'untrusted' msg based on validity not trust
authorPaul <paul@claws-mail.org>
Tue, 24 Jun 2014 10:39:04 +0000 (11:39 +0100)
committerPaul <paul@claws-mail.org>
Tue, 24 Jun 2014 10:39:04 +0000 (11:39 +0100)
src/plugins/pgpcore/sgpgme.c

index 51c821dcbebde6ac7a0b8b0bf4995a4c051c1258..b95ad7a77347d7ecfe8131984c063c94377724f7 100644 (file)
@@ -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);