From: Jameson Graef Rollins Date: Sat, 26 May 2012 18:45:40 +0000 (+1700) Subject: [PATCH v5 1/7] cli: use new typedef to deal with gmime 2.4/2.6 context incompatibility X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fdbf432fdee4f6fb813ce1f72d0a0e4a81ce434a;p=notmuch-archives.git [PATCH v5 1/7] cli: use new typedef to deal with gmime 2.4/2.6 context incompatibility --- diff --git a/1e/db21a6dd2a43365c0ee0f4ccf0e25491dcff9d b/1e/db21a6dd2a43365c0ee0f4ccf0e25491dcff9d new file mode 100644 index 000000000..ea3193e7a --- /dev/null +++ b/1e/db21a6dd2a43365c0ee0f4ccf0e25491dcff9d @@ -0,0 +1,134 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id D6033429E25 + for ; Sat, 26 May 2012 11:45:55 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Oj6B33FDQs17 for ; + Sat, 26 May 2012 11:45:55 -0700 (PDT) +Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu + [131.215.239.19]) + by olra.theworths.org (Postfix) with ESMTP id 16FFB431FBC + for ; Sat, 26 May 2012 11:45:55 -0700 (PDT) +Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1]) + by fire-doxen-postvirus (Postfix) with ESMTP id 990CB328017 + for ; Sat, 26 May 2012 11:45:54 -0700 (PDT) +X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new +Received: from finestructure.net (unknown [76.89.192.57]) + (Authenticated sender: jrollins) + by fire-doxen-submit (Postfix) with ESMTP id CD7AB2E50CDC + for ; Sat, 26 May 2012 11:45:51 -0700 (PDT) +Received: by finestructure.net (Postfix, from userid 1000) + id 66242188; Sat, 26 May 2012 11:45:51 -0700 (PDT) +From: Jameson Graef Rollins +To: Notmuch Mail +Subject: [PATCH v5 1/7] cli: use new typedef to deal with gmime 2.4/2.6 + context incompatibility +Date: Sat, 26 May 2012 11:45:40 -0700 +Message-Id: <1338057946-29209-2-git-send-email-jrollins@finestructure.net> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1338057946-29209-1-git-send-email-jrollins@finestructure.net> +References: <1338057946-29209-1-git-send-email-jrollins@finestructure.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 26 May 2012 18:45:56 -0000 + +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. +--- + mime-node.c | 12 ++---------- + notmuch-client.h | 15 +++++---------- + 2 files changed, 7 insertions(+), 20 deletions(-) + +diff --git a/mime-node.c b/mime-node.c +index a95bdab..a5645e5 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); +diff --git a/notmuch-client.h b/notmuch-client.h +index 19b7f01..d377b04 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. +-- +1.7.10 +