fix erroneous 'untrusted' msg based on validity not trust

[claws.git] / src / plugins / pgpcore / sgpgme.c

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index cbe64805c692b179b10599059c01ac28c94af16c..b95ad7a77347d7ecfe8131984c063c94377724f7 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -209,28 +209,16 @@ 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);
                break;
        case GPG_ERR_KEY_EXPIRED:
-               result = g_strdup_printf(_("Expired key from %s."), uname);
+               result = g_strdup_printf(_("Good signature from %s, but the key has expired."), uname);
                break;
        case GPG_ERR_CERT_REVOKED:
-               result = g_strdup_printf(_("Revoked key from %s."), uname);
+               result = g_strdup_printf(_("Good signature from %s, but the key has been revoked."), uname);
                break;
        case GPG_ERR_BAD_SIGNATURE:
                result = g_strdup_printf(_("Bad signature from %s."), uname);
@@ -304,17 +292,21 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
                
                switch (gpg_err_code(sig->status)) {
                case GPG_ERR_NO_ERROR:
-               case GPG_ERR_KEY_EXPIRED:
                        g_string_append_printf(siginfo,
                                _("Good signature from uid \"%s\" (Validity: %s)\n"),
                                uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN));
                        break;
+               case GPG_ERR_KEY_EXPIRED:
+                       g_string_append_printf(siginfo,
+                               _("Expired key uid \"%s\"\n"),
+                               uid);
+                       break;
                case GPG_ERR_SIG_EXPIRED:
                        g_string_append_printf(siginfo,
                                _("Expired signature from uid \"%s\" (Validity: %s)\n"),
                                uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN));
                        break;
-               case GPG_ERR_CERT_EXPIRED:
+               case GPG_ERR_CERT_REVOKED:
                        g_string_append_printf(siginfo,
                                _("Revoked key uid \"%s\"\n"),
                                uid);