debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-03 07:11:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: use new typedef to deal with gmime 2.4/2.6 context incompatibility

Browse source 
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.
This commit is contained in:
Jameson Graef Rollins 2012-05-26 11:45:40 -07:00 committed by David Bremner
parent 0ff57e75cf
commit 25c3140e13
2 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mime-node.c
View file

@ -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);

15
notmuch-client.h
View file

@ -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.