From: David Bremner <david@tethera.net>
Date: Sat, 15 Jul 2017 23:01:46 +0000 (+0200)
Subject: crypto: clean up unused definitions in gmime 3.0
X-Git-Tag: 0.25_rc0~7
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=edb933b25d386856a3a322b78c4af44e4db39c7a

crypto: clean up unused definitions in gmime 3.0

based on the same patch from dkg as the previous commit.
---

diff --git a/notmuch-client.h b/notmuch-client.h
index 11aefbb4..ae37360b 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -72,11 +72,11 @@ typedef struct notmuch_show_format {
 } notmuch_show_format_t;
 
 typedef struct notmuch_crypto {
-    notmuch_crypto_context_t* gpgctx;
-    notmuch_crypto_context_t* pkcs7ctx;
     notmuch_bool_t verify;
     notmuch_bool_t decrypt;
 #if (GMIME_MAJOR_VERSION < 3)
+    notmuch_crypto_context_t* gpgctx;
+    notmuch_crypto_context_t* pkcs7ctx;
     const char *gpgpath;
 #endif
 } notmuch_crypto_t;
@@ -180,8 +180,10 @@ typedef struct _notmuch_config notmuch_config_t;
 void
 notmuch_exit_if_unsupported_format (void);
 
+#if (GMIME_MAJOR_VERSION <3)
 notmuch_crypto_context_t *
 notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol);
+#endif
 
 int
 notmuch_crypto_cleanup (notmuch_crypto_t *crypto);