gmime-cleanup: remove obsolete gpg_path configuration option and crypto contexts

[notmuch] / util / crypto.h

diff --git a/util/crypto.h b/util/crypto.h
index c384601c11d35772a727c55996f4c3180076481e..dbb333eb4c5d955648134fd7de3896d52a2fae02 100644 (file)
--- a/util/crypto.h
+++ b/util/crypto.h
@@ -5,14 +5,13 @@
 #include "gmime-extra.h"
 #include "notmuch.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _notmuch_crypto {
     bool verify;
     notmuch_decryption_policy_t decrypt;
-#if (GMIME_MAJOR_VERSION < 3)
-    GMimeCryptoContext* gpgctx;
-    GMimeCryptoContext* pkcs7ctx;
-    const char *gpgpath;
-#endif
 } _notmuch_crypto_t;
 
 GMimeObject *
@@ -24,14 +23,10 @@ _notmuch_crypto_decrypt (bool *attempted,
                         GMimeDecryptResult **decrypt_result,
                         GError **err);
 
-#if (GMIME_MAJOR_VERSION < 3)
-notmuch_status_t
-_notmuch_crypto_get_gmime_ctx_for_protocol (_notmuch_crypto_t *crypto,
-                                           const char *protocol,
-                                           GMimeCryptoContext **ctx);
-#endif
-
 void
 _notmuch_crypto_cleanup (_notmuch_crypto_t *crypto);
 
+#ifdef __cplusplus
+}
+#endif
 #endif