From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id C4B946DE263F for ; Sat, 15 Jul 2017 16:01:54 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[AWL=0.000] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dsJw3yXDHi1T for ; Sat, 15 Jul 2017 16:01:54 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTP id 352366DE261D for ; Sat, 15 Jul 2017 16:01:52 -0700 (PDT) Received: from fifthhorseman.net (38.200.broadband6.iol.cz [88.101.200.38]) by che.mayfirst.org (Postfix) with ESMTPSA id 20EC0F99E; Sat, 15 Jul 2017 19:01:51 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 0C3A620FF5; Sun, 16 Jul 2017 01:01:47 +0200 (CEST) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH v2 4/4] crypto: clean up unused definitions in gmime 3.0 Date: Sun, 16 Jul 2017 01:01:46 +0200 Message-Id: <20170715230146.12695-4-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170715230146.12695-1-dkg@fifthhorseman.net> References: <87mv85qpyw.fsf@fifthhorseman.net> <20170715230146.12695-1-dkg@fifthhorseman.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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, 15 Jul 2017 23:01:54 -0000 From: David Bremner based on the same patch from dkg as the previous commit. --- notmuch-client.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index 11aefbb4..ae37360b 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -72,11 +72,11 @@ typedef struct notmuch_show_format { } notmuch_show_format_t; typedef struct notmuch_crypto { - notmuch_crypto_context_t* gpgctx; - notmuch_crypto_context_t* pkcs7ctx; notmuch_bool_t verify; notmuch_bool_t decrypt; #if (GMIME_MAJOR_VERSION < 3) + notmuch_crypto_context_t* gpgctx; + notmuch_crypto_context_t* pkcs7ctx; const char *gpgpath; #endif } notmuch_crypto_t; @@ -180,8 +180,10 @@ typedef struct _notmuch_config notmuch_config_t; void notmuch_exit_if_unsupported_format (void); +#if (GMIME_MAJOR_VERSION <3) notmuch_crypto_context_t * notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol); +#endif int notmuch_crypto_cleanup (notmuch_crypto_t *crypto); -- 2.13.2