diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2019-05-02 09:19:36 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2019-05-03 06:55:04 -0300 |
| commit | 096d45a878ba9606f1677f66d346b14c3c274fa5 (patch) | |
| tree | 16a875121b5354ba37c5667d37ec06f4254085b4 /mime-node.c | |
| parent | 35e21bfb6f5fa4a0b61a71860e1f7f04d9e3e274 (diff) | |
gmime-cleanup: remove obsolete gpg_path configuration option and crypto contexts
Note that we do keep ignoring the gpg_path configuration option,
though, to avoid breakage of existing installations. It is ignored
like any other unknown configuration option, but we at least document
that it is ignored so that people who find it in their legacy configs
can know that it's safe to drop.
signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'mime-node.c')
| -rw-r--r-- | mime-node.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/mime-node.c b/mime-node.c index 053f044a..a8005f70 100644 --- a/mime-node.c +++ b/mime-node.c @@ -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) { |