X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=mime-node.c;h=ae3ebef624d5d1383baf0e2f7c39547f6f73dbfe;hp=7c8b26024460346ff3387df68234dddfd1256a36;hb=5f2832ae2171714dfef6d0d3302f473526480157;hpb=9beda4b9811323d1fd9eb120d6e7a2ef69beed14 diff --git a/mime-node.c b/mime-node.c index 7c8b2602..ae3ebef6 100644 --- a/mime-node.c +++ b/mime-node.c @@ -199,12 +199,8 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part); node->decrypt_attempted = true; - node->decrypted_child = g_mime_multipart_encrypted_decrypt -#if (GMIME_MAJOR_VERSION < 3) - (encrypteddata, cryptoctx, &decrypt_result, &err); -#else - (encrypteddata, GMIME_DECRYPT_NONE, NULL, &decrypt_result, &err); -#endif + if (! node->decrypted_child) + node->decrypted_child = _notmuch_crypto_decrypt (cryptoctx, encrypteddata, &decrypt_result, &err); if (! node->decrypted_child) { fprintf (stderr, "Failed to decrypt part: %s\n", err ? err->message : "no error explanation given");