diff options
| author |  Jameson Graef Rollins <jrollins@finestructure.net> | 2012-05-26 11:45:40 -0700 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2012-06-10 20:04:50 -0300 |
| commit | 25c3140e13698b147baedd99b2d6f8775c67de07 (patch) | |
| tree | f3752bf8255d361d7d3fc3c883879a94297926ef /notmuch-client.h | |
| parent | 0ff57e75cf5847d2cbef97a49badb4cccc618300 (diff) | |
cli: use new typedef to deal with gmime 2.4/2.6 context incompatibility
gmime 2.4 defines GMimeCipherContext, while 2.6 defines
GMimeCryptoContext. typedef them both to notmuch_crypto_context_t to
cover this discrepancy and remove a bunch of #ifdefs.
Diffstat (limited to 'notmuch-client.h')
| -rw-r--r-- | notmuch-client.h | 15 |
1 files changed, 5 insertions, 10 deletions
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. |