X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-client.h;h=18e6c60ba6ceb688f3303308247a4c70dd3c1d2a;hb=742b566cac5bae98d612bff306f08d45d4e27614;hp=de8a3b15f86558886f79abaf909995192a75d09a;hpb=39c54df26dad01e3ec294f7c4a613d9ee71faf3e;p=notmuch diff --git a/notmuch-client.h b/notmuch-client.h index de8a3b15..18e6c60b 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -31,6 +31,8 @@ #include typedef GMimeCryptoContext notmuch_crypto_context_t; +/* This is automatically included only since gmime 2.6.10 */ +#include #include "notmuch.h" @@ -48,6 +50,7 @@ typedef GMimeCryptoContext notmuch_crypto_context_t; #include #include #include +#include #include "talloc-extra.h" @@ -69,6 +72,7 @@ typedef struct notmuch_show_format { typedef struct notmuch_crypto { notmuch_crypto_context_t* gpgctx; + notmuch_crypto_context_t* pkcs7ctx; notmuch_bool_t verify; notmuch_bool_t decrypt; const char *gpgpath; @@ -406,8 +410,8 @@ struct mime_node { /* Construct a new MIME node pointing to the root message part of * message. If crypto->verify is true, signed child parts will be * verified. If crypto->decrypt is true, encrypted child parts will be - * decrypted. If crypto->gpgctx is NULL, it will be lazily - * initialized. + * decrypted. If the crypto contexts (crypto->gpgctx or + * crypto->pkcs7) are NULL, they will be lazily initialized. * * Return value: *