1 Return-Path: <bremner@tesseract.cs.unb.ca>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by arlo.cworth.org (Postfix) with ESMTP id 5BC006DE0B26
\r
6 for <notmuch@notmuchmail.org>; Sun, 16 Aug 2015 08:51:44 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.129 tagged_above=-999 required=5 tests=[AWL=0.119,
\r
12 T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled
\r
13 Received: from arlo.cworth.org ([127.0.0.1])
\r
14 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id eUyXdAOhHQua for <notmuch@notmuchmail.org>;
\r
16 Sun, 16 Aug 2015 08:51:42 -0700 (PDT)
\r
17 Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224])
\r
18 by arlo.cworth.org (Postfix) with ESMTPS id 6B0056DE01D3
\r
19 for <notmuch@notmuchmail.org>; Sun, 16 Aug 2015 08:51:42 -0700 (PDT)
\r
20 Received: from remotemail by gitolite.debian.net with local (Exim 4.80)
\r
21 (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
22 id 1ZR0D6-0003HT-1n; Sun, 16 Aug 2015 15:51:00 +0000
\r
23 Received: (nullmailer pid 27059 invoked by uid 1000); Sun, 16 Aug 2015
\r
25 From: David Bremner <david@tethera.net>
\r
26 To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
\r
27 Subject: [PATCH] fixup! cli/lib: remove support for GMime 2.4
\r
28 Date: Sun, 16 Aug 2015 17:50:44 +0200
\r
29 Message-Id: <1439740244-27017-1-git-send-email-david@tethera.net>
\r
30 X-Mailer: git-send-email 2.5.0
\r
31 In-Reply-To: <1439739201-11068-1-git-send-email-david@tethera.net>
\r
32 References: <1439739201-11068-1-git-send-email-david@tethera.net>
\r
33 X-BeenThere: notmuch@notmuchmail.org
\r
34 X-Mailman-Version: 2.1.18
\r
36 List-Id: "Use and development of the notmuch mail system."
\r
37 <notmuch.notmuchmail.org>
\r
38 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
39 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
40 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
41 List-Post: <mailto:notmuch@notmuchmail.org>
\r
42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
43 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
45 X-List-Received-Date: Sun, 16 Aug 2015 15:51:44 -0000
\r
48 notmuch-client.h | 18 +-----------------
\r
49 1 file changed, 1 insertion(+), 17 deletions(-)
\r
51 diff --git a/notmuch-client.h b/notmuch-client.h
\r
52 index 78680aa..1f82656 100644
\r
53 --- a/notmuch-client.h
\r
54 +++ b/notmuch-client.h
\r
57 #include <gmime/gmime.h>
\r
59 -/* GMIME_CHECK_VERSION in gmime 2.4 is not usable from the
\r
60 - * preprocessor (it calls a runtime function). But since
\r
61 - * GMIME_MAJOR_VERSION and friends were added in gmime 2.6, we can use
\r
62 - * these to check the version number. */
\r
63 -#ifdef GMIME_MAJOR_VERSION
\r
64 -#define GMIME_ATLEAST_26
\r
65 typedef GMimeCryptoContext notmuch_crypto_context_t;
\r
67 -typedef GMimeCipherContext notmuch_crypto_context_t;
\r
70 #include "notmuch.h"
\r
72 @@ -394,17 +385,10 @@ struct mime_node {
\r
74 /* True if signature verification on this part was attempted. */
\r
75 notmuch_bool_t verify_attempted;
\r
76 -#ifdef GMIME_ATLEAST_26
\r
78 /* The list of signatures for signed or encrypted containers. If
\r
79 * there are no signatures, this will be NULL. */
\r
80 GMimeSignatureList* sig_list;
\r
82 - /* For signed or encrypted containers, the validity of the
\r
83 - * signature. May be NULL if signature verification failed. If
\r
84 - * there are simply no signatures, this will be non-NULL with an
\r
85 - * empty signers list. */
\r
86 - const GMimeSignatureValidity *sig_validity;
\r
89 /* Internal: Context inherited from the root iterator. */
\r
90 struct mime_node_context *ctx;
\r