X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-client.h;h=d17cdf01567ac89c91a99a55c49cad8f11e5ec82;hp=0365baae4b89a131925f41207f228f749a670ea7;hb=886c0b1666478548485682fbcaa667bb3cc0f138;hpb=0f314c0c99befea599a68bea51d759b4133efef6 diff --git a/notmuch-client.h b/notmuch-client.h index 0365baae..d17cdf01 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -32,10 +32,6 @@ #include "gmime-extra.h" -typedef GMimeCryptoContext notmuch_crypto_context_t; -/* This is automatically included only since gmime 2.6.10 */ -#include - #include "notmuch.h" /* This is separate from notmuch-private.h because we're trying to @@ -55,6 +51,7 @@ typedef GMimeCryptoContext notmuch_crypto_context_t; #include #include "talloc-extra.h" +#include "crypto.h" #define unused(x) x __attribute__ ((unused)) @@ -72,22 +69,12 @@ typedef struct notmuch_show_format { const struct notmuch_show_params *params); } notmuch_show_format_t; -typedef struct notmuch_crypto { - bool verify; - bool decrypt; -#if (GMIME_MAJOR_VERSION < 3) - notmuch_crypto_context_t* gpgctx; - notmuch_crypto_context_t* pkcs7ctx; - const char *gpgpath; -#endif -} 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; @@ -181,14 +168,6 @@ 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); - int notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]); @@ -449,7 +428,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