X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-client.h;h=d377b044fdccb06886b3a111f5e0daee0f7b7e78;hp=19b7f01f09889fe06be8864fa179a7a931e5af78;hb=25c3140e13698b147baedd99b2d6f8775c67de07;hpb=9070e5cc432b7dcad09a47508f6ade34ff63d47d diff --git a/notmuch-client.h b/notmuch-client.h index 19b7f01f..d377b044 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -36,6 +36,9 @@ * these to check the version number. */ #ifdef GMIME_MAJOR_VERSION #define GMIME_ATLEAST_26 +typedef GMimeCryptoContext notmuch_crypto_context_t; +#else +typedef GMimeCipherContext notmuch_crypto_context_t; #endif #include "notmuch.h" @@ -79,11 +82,7 @@ typedef struct notmuch_show_params { notmuch_bool_t omit_excluded; notmuch_bool_t raw; int part; -#ifdef GMIME_ATLEAST_26 - GMimeCryptoContext* cryptoctx; -#else - GMimeCipherContext* cryptoctx; -#endif + notmuch_crypto_context_t* cryptoctx; notmuch_bool_t decrypt; } notmuch_show_params_t; @@ -355,11 +354,7 @@ struct mime_node { */ notmuch_status_t mime_node_open (const void *ctx, notmuch_message_t *message, -#ifdef GMIME_ATLEAST_26 - GMimeCryptoContext *cryptoctx, -#else - GMimeCipherContext *cryptoctx, -#endif + notmuch_crypto_context_t *cryptoctx, notmuch_bool_t decrypt, mime_node_t **node_out); /* Return a new MIME node for the requested child part of parent.