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 /mime-node.c | |
| 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 'mime-node.c')
| -rw-r--r-- | mime-node.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mime-node.c b/mime-node.c index a95bdabc..a5645e5c 100644 --- a/mime-node.c +++ b/mime-node.c @@ -33,11 +33,7 @@ typedef struct mime_node_context { GMimeMessage *mime_message; /* Context provided by the caller. */ -#ifdef GMIME_ATLEAST_26 - GMimeCryptoContext *cryptoctx; -#else - GMimeCipherContext *cryptoctx; -#endif + notmuch_crypto_context_t *cryptoctx; notmuch_bool_t decrypt; } mime_node_context_t; @@ -61,11 +57,7 @@ _mime_node_context_free (mime_node_context_t *res) 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 **root_out) { const char *filename = notmuch_message_get_filename (message); |