1 Return-Path: <jani@nikula.org>
\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 olra.theworths.org (Postfix) with ESMTP id 39FD7431FAE
\r
6 for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:53:33 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id t1+czH0gqUwr for <notmuch@notmuchmail.org>;
\r
17 Sat, 30 Mar 2013 06:53:31 -0700 (PDT)
\r
18 Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com
\r
19 [209.85.217.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 22D0E429E29
\r
22 for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:53:29 -0700 (PDT)
\r
23 Received: by mail-lb0-f173.google.com with SMTP id w20so924072lbh.32
\r
24 for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:53:28 -0700 (PDT)
\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=google.com; s=20120113;
\r
27 h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
\r
28 :references:in-reply-to:references:x-gm-message-state;
\r
29 bh=er/PM2iXC8n+9BoV3NX5TIb42VNCDR++4NoUo0UPL1g=;
\r
30 b=OqMKI7z73x//XodRk0Hz/Jhe6yD6uRzFBAiN44rnXJS0gYkhCQJswJYzKuMdX7a942
\r
31 Gb/ptDCLtuwLGjR15UvEOzppkDfxZZWnUxktzUhuastBNHApeostr5B2r3BG+X6t4TNt
\r
32 JmHVsjUmR8XMyAUTRP24yMzDWPCmU3OxBzyZojVF9Y7wMbQatcbV00m0y2xHuYMbj3J7
\r
33 Rnk6At/G6YhKwqmCnbKrZIKoxcWwqHCYN/UftWdIm29BaeMO9GUcz6K3+W9f7FwMfgnV
\r
34 Sq7Y1oKo+1sCYJbdKDBQLoQuLN+2hjkSOyft2cWeDS6PKBuKhPRB2++85lm487BTejJ+
\r
36 X-Received: by 10.112.40.36 with SMTP id u4mr2929198lbk.36.1364651608635;
\r
37 Sat, 30 Mar 2013 06:53:28 -0700 (PDT)
\r
38 Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.
\r
40 by mx.google.com with ESMTPS id sl5sm2630960lbb.10.2013.03.30.06.53.27
\r
41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
42 Sat, 30 Mar 2013 06:53:27 -0700 (PDT)
\r
43 From: Jani Nikula <jani@nikula.org>
\r
44 To: notmuch@notmuchmail.org
\r
45 Subject: [PATCH v2 3/3] cli: conform to same conditional build style as
\r
46 elsewhere in notmuch-show
\r
47 Date: Sat, 30 Mar 2013 15:53:17 +0200
\r
49 <538bbf4e8113b242e0f193ee4a92ffeaaff1ab71.1364651359.git.jani@nikula.org>
\r
50 X-Mailer: git-send-email 1.7.10.4
\r
51 In-Reply-To: <cover.1364651359.git.jani@nikula.org>
\r
52 References: <cover.1364651359.git.jani@nikula.org>
\r
53 In-Reply-To: <cover.1364651359.git.jani@nikula.org>
\r
54 References: <cover.1364651359.git.jani@nikula.org>
\r
56 ALoCoQkEs5+JSWakpqUrhAGi4lj7GyjL9fItKTt8/cv/mJwMmdwCJHgtTA2gqqtLHdVTKwXWUFrH
\r
57 X-BeenThere: notmuch@notmuchmail.org
\r
58 X-Mailman-Version: 2.1.13
\r
60 List-Id: "Use and development of the notmuch mail system."
\r
61 <notmuch.notmuchmail.org>
\r
62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
65 List-Post: <mailto:notmuch@notmuchmail.org>
\r
66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
69 X-List-Received-Date: Sat, 30 Mar 2013 13:53:33 -0000
\r
71 Conform to the same style for #ifdef GMIME_ATLEAST_26 conditional
\r
72 builds as elsewhere.
\r
74 There are no functional changes.
\r
76 notmuch-show.c | 46 ++++++++++++++++++++++++++--------------------
\r
77 1 file changed, 26 insertions(+), 20 deletions(-)
\r
79 diff --git a/notmuch-show.c b/notmuch-show.c
\r
80 index c2ec122..62178f7 100644
\r
81 --- a/notmuch-show.c
\r
82 +++ b/notmuch-show.c
\r
83 @@ -335,6 +335,8 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out,
\r
86 #ifdef GMIME_ATLEAST_26
\r
88 +/* Get signature status string (GMime 2.6) */
\r
90 signature_status_to_string (GMimeSignatureStatus x)
\r
92 @@ -348,25 +350,8 @@ signature_status_to_string (GMimeSignatureStatus x)
\r
98 -signer_status_to_string (GMimeSignerStatus x)
\r
101 - case GMIME_SIGNER_STATUS_NONE:
\r
103 - case GMIME_SIGNER_STATUS_GOOD:
\r
105 - case GMIME_SIGNER_STATUS_BAD:
\r
107 - case GMIME_SIGNER_STATUS_ERROR:
\r
110 - return "unknown";
\r
114 -#ifdef GMIME_ATLEAST_26
\r
115 +/* Signature status sprinter (GMime 2.6) */
\r
117 format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)
\r
119 @@ -441,7 +426,27 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)
\r
125 +#else /* GMIME_ATLEAST_26 */
\r
127 +/* Get signature status string (GMime 2.4) */
\r
128 +static const char*
\r
129 +signer_status_to_string (GMimeSignerStatus x)
\r
132 + case GMIME_SIGNER_STATUS_NONE:
\r
134 + case GMIME_SIGNER_STATUS_GOOD:
\r
136 + case GMIME_SIGNER_STATUS_BAD:
\r
138 + case GMIME_SIGNER_STATUS_ERROR:
\r
141 + return "unknown";
\r
144 +/* Signature status sprinter (GMime 2.4) */
\r
146 format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)
\r
148 @@ -504,7 +509,8 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)
\r
154 +#endif /* GMIME_ATLEAST_26 */
\r
156 static notmuch_status_t
\r
157 format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
\r