gmime-cleanup: use GMime 3.0 function names

[notmuch] / util / crypto.h

diff --git a/util/crypto.h b/util/crypto.h
index 80628dc528d258057561a37168d116437fa2d75c..af3998e8466e346bdcef95310031d88e68742c7a 100644 (file)
--- a/util/crypto.h
+++ b/util/crypto.h
@@ -2,27 +2,30 @@
 #define _CRYPTO_H
 
 #include <stdbool.h>
-#if (GMIME_MAJOR_VERSION < 3)
 #include "gmime-extra.h"
+#include "notmuch.h"
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
 typedef struct _notmuch_crypto {
     bool verify;
-    bool decrypt;
-#if (GMIME_MAJOR_VERSION < 3)
-    GMimeCryptoContext* gpgctx;
-    GMimeCryptoContext* pkcs7ctx;
-    const char *gpgpath;
-#endif
+    notmuch_decryption_policy_t decrypt;
 } _notmuch_crypto_t;
 
-
-#if (GMIME_MAJOR_VERSION < 3)
-GMimeCryptoContext *
-_notmuch_crypto_get_gmime_context (_notmuch_crypto_t *crypto, const char *protocol);
-#endif
+GMimeObject *
+_notmuch_crypto_decrypt (bool *attempted,
+                        notmuch_decryption_policy_t decrypt,
+                        notmuch_message_t *message,
+                        GMimeMultipartEncrypted *part,
+                        GMimeDecryptResult **decrypt_result,
+                        GError **err);
 
 void
 _notmuch_crypto_cleanup (_notmuch_crypto_t *crypto);
 
+#ifdef __cplusplus
+}
+#endif
 #endif