gmime-cleanup: pass NULL as default GMimeParserOptions

[notmuch] / mime-node.c

diff --git a/mime-node.c b/mime-node.c
index a8005f708d6b5dfb69761d69561ea6af20df210c..cd3db67dfedde9d370f8cf7d78bf6a2bcef4698c 100644 (file)
--- a/mime-node.c
+++ b/mime-node.c
@@ -121,7 +121,7 @@ mime_node_open (const void *ctx, notmuch_message_t *message,
        goto DONE;
     }
 
-    mctx->mime_message = g_mime_parser_construct_message (mctx->parser);
+    mctx->mime_message = g_mime_parser_construct_message (mctx->parser, NULL);
     if (!mctx->mime_message) {
        fprintf (stderr, "Failed to parse %s\n", filename);
        status = NOTMUCH_STATUS_FILE_ERROR;
@@ -170,14 +170,13 @@ set_signature_list_destructor (mime_node_t *node)
 
 /* Verify a signed mime node */
 static void
-node_verify (mime_node_t *node, GMimeObject *part,
-            g_mime_3_unused(GMimeCryptoContext *cryptoctx))
+node_verify (mime_node_t *node, GMimeObject *part)
 {
     GError *err = NULL;
 
     node->verify_attempted = true;
     node->sig_list = g_mime_multipart_signed_verify
-       (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err);
+       (GMIME_MULTIPART_SIGNED (part), GMIME_ENCRYPT_NONE, &err);
 
     if (node->sig_list)
        set_signature_list_destructor (node);
@@ -191,8 +190,7 @@ node_verify (mime_node_t *node, GMimeObject *part,
 
 /* 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))
+node_decrypt_and_verify (mime_node_t *node, GMimeObject *part)
 {
     GError *err = NULL;
     GMimeDecryptResult *decrypt_result = NULL;
@@ -209,7 +207,7 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
        node->decrypted_child = _notmuch_crypto_decrypt (&node->decrypt_attempted,
                                                         node->ctx->crypto->decrypt,
                                                         message,
-                                                        cryptoctx, encrypteddata, &decrypt_result, &err);
+                                                        encrypteddata, &decrypt_result, &err);
     }
     if (! node->decrypted_child) {
        fprintf (stderr, "Failed to decrypt part: %s\n",
@@ -228,7 +226,6 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
            set_signature_list_destructor (node);
        }
 
-#if HAVE_GMIME_SESSION_KEYS
        if (node->ctx->crypto->decrypt == NOTMUCH_DECRYPT_TRUE && message) {
            notmuch_database_t *db = notmuch_message_get_database (message);
            const char *session_key = g_mime_decrypt_result_get_session_key (decrypt_result);
@@ -238,7 +235,6 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
                                      notmuch_message_add_property (message, "session-key",
                                                                    session_key));
        }
-#endif
        g_object_unref (decrypt_result);
     }
 
@@ -251,7 +247,6 @@ static mime_node_t *
 _mime_node_create (mime_node_t *parent, GMimeObject *part)
 {
     mime_node_t *node = talloc_zero (parent, mime_node_t);
-    GMimeCryptoContext *cryptoctx = NULL;
 
     /* Set basic node properties */
     node->part = part;
@@ -292,7 +287,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
                     "message (must be exactly 2)\n",
                     node->nchildren);
        } else {
-           node_decrypt_and_verify (node, part, cryptoctx);
+           node_decrypt_and_verify (node, part);
        }
     } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify) {
        if (node->nchildren != 2) {
@@ -301,7 +296,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
                     "(must be exactly 2)\n",
                     node->nchildren);
        } else {
-           node_verify (node, part, cryptoctx);
+           node_verify (node, part);
        }
     }