diff options
author | David Bremner <david@tethera.net> | 2015-08-16 17:33:21 +0200 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2015-08-26 20:01:45 -0300 |
commit | 005c2f0df17de8afdf9f67b923d26f2358236171 (patch) | |
tree | 92c803b40732cb353da299cbbd3cd46a9f71e0b4 /notmuch-client.h | |
parent | cb08a2ee019e52dc29ba393d139fce8d7282c632 (diff) |
cli/lib: remove support for GMime 2.4
It's becoming a maintenance burden to do anything things with the
crypto glue code twice, once for 2.4 and once for 2.6. I don't have
any 2.4 version available to test on my development machine anymore,
so the 2.4 specific code paths are likely not very well tested.
Diffstat (limited to 'notmuch-client.h')
-rw-r--r-- | notmuch-client.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/notmuch-client.h b/notmuch-client.h index 4a4f86c4..882aa305 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -30,16 +30,7 @@ #include <gmime/gmime.h> -/* GMIME_CHECK_VERSION in gmime 2.4 is not usable from the - * preprocessor (it calls a runtime function). But since - * GMIME_MAJOR_VERSION and friends were added in gmime 2.6, we can use - * these to check the version number. */ -#ifdef GMIME_MAJOR_VERSION -#define GMIME_ATLEAST_26 typedef GMimeCryptoContext notmuch_crypto_context_t; -#else -typedef GMimeCipherContext notmuch_crypto_context_t; -#endif #include "notmuch.h" @@ -394,17 +385,10 @@ struct mime_node { /* True if signature verification on this part was attempted. */ notmuch_bool_t verify_attempted; -#ifdef GMIME_ATLEAST_26 + /* The list of signatures for signed or encrypted containers. If * there are no signatures, this will be NULL. */ GMimeSignatureList* sig_list; -#else - /* For signed or encrypted containers, the validity of the - * signature. May be NULL if signature verification failed. If - * there are simply no signatures, this will be non-NULL with an - * empty signers list. */ - const GMimeSignatureValidity *sig_validity; -#endif /* Internal: Context inherited from the root iterator. */ struct mime_node_context *ctx; |