[PATCH v2 4/4] crypto: clean up unused definitions in gmime 3.0

[Daniel Kahn Gillmor <dkg@fifthhorseman.net>]

From: David Bremner <david@tethera.net>

based on the same patch from dkg as the previous commit.
---
 notmuch-client.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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);
-- 
2.13.2