X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=notmuch-client.h;h=62acc70ea9f73e7bab096649c41f5606a8211aa5;hb=3e9857a0b98c04973b9b6ad2da7dc5c3992b3b1c;hp=0365baae4b89a131925f41207f228f749a670ea7;hpb=0f314c0c99befea599a68bea51d759b4133efef6;p=notmuch

diff --git a/notmuch-client.h b/notmuch-client.h
index 0365baae..62acc70e 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -32,7 +32,6 @@
 
 #include "gmime-extra.h"
 
-typedef GMimeCryptoContext notmuch_crypto_context_t;
 /* This is automatically included only since gmime 2.6.10 */
 #include <gmime/gmime-pkcs7-context.h>
 
@@ -72,22 +71,22 @@ typedef struct notmuch_show_format {
 			      const struct notmuch_show_params *params);
 } notmuch_show_format_t;
 
-typedef struct notmuch_crypto {
+typedef struct _notmuch_crypto {
     bool verify;
     bool decrypt;
 #if (GMIME_MAJOR_VERSION < 3)
-    notmuch_crypto_context_t* gpgctx;
-    notmuch_crypto_context_t* pkcs7ctx;
+    GMimeCryptoContext* gpgctx;
+    GMimeCryptoContext* pkcs7ctx;
     const char *gpgpath;
 #endif
-} notmuch_crypto_t;
+} _notmuch_crypto_t;
 
 typedef struct notmuch_show_params {
     bool entire_thread;
     bool omit_excluded;
     bool output_body;
     int part;
-    notmuch_crypto_t crypto;
+    _notmuch_crypto_t crypto;
     bool include_html;
     GMimeStream *out_stream;
 } notmuch_show_params_t;
@@ -182,12 +181,12 @@ 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);
+GMimeCryptoContext *
+_notmuch_crypto_get_gmime_context (_notmuch_crypto_t *crypto, const char *protocol);
 #endif
 
 int
-notmuch_crypto_cleanup (notmuch_crypto_t *crypto);
+_notmuch_crypto_cleanup (_notmuch_crypto_t *crypto);
 
 int
 notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]);
@@ -449,7 +448,7 @@ struct mime_node {
  */
 notmuch_status_t
 mime_node_open (const void *ctx, notmuch_message_t *message,
-		notmuch_crypto_t *crypto, mime_node_t **node_out);
+		_notmuch_crypto_t *crypto, mime_node_t **node_out);
 
 /* Return a new MIME node for the requested child part of parent.
  * parent will be used as the talloc context for the returned child