gmime-cleanup: remove obsolete gpg_path configuration option and crypto contexts

[notmuch] / mime-node.c

diff --git a/mime-node.c b/mime-node.c
index 2a24e537c6a25fa4b79785f33062826666b63b88..a8005f708d6b5dfb69761d69561ea6af20df210c 100644 (file)
--- a/mime-node.c
+++ b/mime-node.c
@@ -149,7 +149,7 @@ DONE:
     return status;
 }
 
-/* Signature list destructor (GMime 2.6) */
+/* Signature list destructor */
 static int
 _signature_list_free (GMimeSignatureList **proxy)
 {
@@ -157,7 +157,7 @@ _signature_list_free (GMimeSignatureList **proxy)
     return 0;
 }
 
-/* Set up signature list destructor (GMime 2.6) */
+/* Set up signature list destructor */
 static void
 set_signature_list_destructor (mime_node_t *node)
 {
@@ -168,7 +168,7 @@ set_signature_list_destructor (mime_node_t *node)
     }
 }
 
-/* Verify a signed mime node (GMime 2.6) */
+/* Verify a signed mime node */
 static void
 node_verify (mime_node_t *node, GMimeObject *part,
             g_mime_3_unused(GMimeCryptoContext *cryptoctx))
@@ -189,7 +189,7 @@ node_verify (mime_node_t *node, GMimeObject *part,
        g_error_free (err);
 }
 
-/* Decrypt and optionally verify an encrypted mime node (GMime 2.6) */
+/* Decrypt and optionally verify an encrypted mime node */
 static void
 node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
                         g_mime_3_unused(GMimeCryptoContext *cryptoctx))
@@ -218,12 +218,12 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
     }
 
     node->decrypt_success = true;
-    node->verify_attempted = true;
 
     if (decrypt_result) {
        /* This may be NULL if the part is not signed. */
        node->sig_list = g_mime_decrypt_result_get_signatures (decrypt_result);
        if (node->sig_list) {
+           node->verify_attempted = true;
            g_object_ref (node->sig_list);
            set_signature_list_destructor (node);
        }
@@ -284,22 +284,6 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
        return NULL;
     }
 
-#if (GMIME_MAJOR_VERSION < 3)
-    if ((GMIME_IS_MULTIPART_ENCRYPTED (part) && (node->ctx->crypto->decrypt != NOTMUCH_DECRYPT_FALSE))
-       || (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify)) {
-       GMimeContentType *content_type = g_mime_object_get_content_type (part);
-       const char *protocol = g_mime_content_type_get_parameter (content_type, "protocol");
-       notmuch_status_t status;
-       status = _notmuch_crypto_get_gmime_ctx_for_protocol (node->ctx->crypto,
-                                                            protocol, &cryptoctx);
-       if (status) /* this is a warning, not an error */
-           fprintf (stderr, "Warning: %s (%s).\n", notmuch_status_to_string (status),
-                    protocol ? protocol : "NULL");
-       if (!cryptoctx)
-           return node;
-    }
-#endif
-
     /* Handle PGP/MIME parts */
     if (GMIME_IS_MULTIPART_ENCRYPTED (part) && (node->ctx->crypto->decrypt != NOTMUCH_DECRYPT_FALSE)) {
        if (node->nchildren != 2) {