gmime-cleanup: always support session keys

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index 88699e90666d4715a302d78426352e36b57f1312..730a91f80827937ed9bb0e9841949ce79c52e6eb 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -383,26 +383,6 @@ do_format_signature_errors (sprinter_t *sp, struct key_map_struct *key_map,
     sp->end (sp);
 }
 
-#if (GMIME_MAJOR_VERSION < 3)
-static void
-format_signature_errors (sprinter_t *sp, GMimeSignature *signature)
-{
-    GMimeSignatureError errors = g_mime_signature_get_errors (signature);
-
-    if (errors == GMIME_SIGNATURE_ERROR_NONE)
-       return;
-
-    struct key_map_struct key_map[] = {
-       { GMIME_SIGNATURE_ERROR_EXPSIG, "sig-expired" },
-       { GMIME_SIGNATURE_ERROR_NO_PUBKEY, "key-missing"},
-       { GMIME_SIGNATURE_ERROR_EXPKEYSIG, "key-expired"},
-       { GMIME_SIGNATURE_ERROR_REVKEYSIG, "key-revoked"},
-       { GMIME_SIGNATURE_ERROR_UNSUPP_ALGO, "alg-unsupported"},
-    };
-
-    do_format_signature_errors (sp, key_map, ARRAY_SIZE(key_map), errors);
-}
-#else
 static void
 format_signature_errors (sprinter_t *sp, GMimeSignature *signature)
 {
@@ -425,9 +405,8 @@ format_signature_errors (sprinter_t *sp, GMimeSignature *signature)
 
     do_format_signature_errors (sp, key_map, ARRAY_SIZE(key_map), errors);
 }
-#endif
 
-/* Signature status sprinter (GMime 2.6) */
+/* Signature status sprinter */
 static void
 format_part_sigstatus_sprinter (sprinter_t *sp, GMimeSignatureList *siglist)
 {
@@ -915,7 +894,6 @@ show_message (void *ctx,
     part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
     if (part)
        status = format->part (local, sp, part, indent, params);
-#if HAVE_GMIME_SESSION_KEYS
     if (params->crypto.decrypt == NOTMUCH_DECRYPT_TRUE && session_key_count_error == NOTMUCH_STATUS_SUCCESS) {
        unsigned int new_session_keys = 0;
        if (notmuch_message_count_properties (message, "session-key", &new_session_keys) == NOTMUCH_STATUS_SUCCESS &&
@@ -929,7 +907,6 @@ show_message (void *ctx,
            }
        }
     }
-#endif
   DONE:
     talloc_free (local);
     return status;
@@ -1234,10 +1211,6 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[])
        return EXIT_FAILURE;
     }
 
-#if (GMIME_MAJOR_VERSION < 3)
-    params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config);
-#endif
-
     notmuch_database_mode_t mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
     if (params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE)
        mode = NOTMUCH_DATABASE_MODE_READ_WRITE;