crypto: clean up unused definitions in gmime 3.0

based on the same patch from dkg as the previous commit.
This commit is contained in:
David Bremner 2017-07-16 01:01:46 +02:00
parent 66c9b11bb0
commit edb933b25d

View file

@ -72,11 +72,11 @@ typedef struct notmuch_show_format {
} notmuch_show_format_t; } notmuch_show_format_t;
typedef struct notmuch_crypto { typedef struct notmuch_crypto {
notmuch_crypto_context_t* gpgctx;
notmuch_crypto_context_t* pkcs7ctx;
notmuch_bool_t verify; notmuch_bool_t verify;
notmuch_bool_t decrypt; notmuch_bool_t decrypt;
#if (GMIME_MAJOR_VERSION < 3) #if (GMIME_MAJOR_VERSION < 3)
notmuch_crypto_context_t* gpgctx;
notmuch_crypto_context_t* pkcs7ctx;
const char *gpgpath; const char *gpgpath;
#endif #endif
} notmuch_crypto_t; } notmuch_crypto_t;
@ -180,8 +180,10 @@ typedef struct _notmuch_config notmuch_config_t;
void void
notmuch_exit_if_unsupported_format (void); notmuch_exit_if_unsupported_format (void);
#if (GMIME_MAJOR_VERSION <3)
notmuch_crypto_context_t * notmuch_crypto_context_t *
notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol); notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol);
#endif
int int
notmuch_crypto_cleanup (notmuch_crypto_t *crypto); notmuch_crypto_cleanup (notmuch_crypto_t *crypto);