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 39FD7431FAE for ; Sat, 30 Mar 2013 06:53:33 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 t1+czH0gqUwr for ; Sat, 30 Mar 2013 06:53:31 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com [209.85.217.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 22D0E429E29 for ; Sat, 30 Mar 2013 06:53:29 -0700 (PDT) Received: by mail-lb0-f173.google.com with SMTP id w20so924072lbh.32 for ; Sat, 30 Mar 2013 06:53:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=er/PM2iXC8n+9BoV3NX5TIb42VNCDR++4NoUo0UPL1g=; b=OqMKI7z73x//XodRk0Hz/Jhe6yD6uRzFBAiN44rnXJS0gYkhCQJswJYzKuMdX7a942 Gb/ptDCLtuwLGjR15UvEOzppkDfxZZWnUxktzUhuastBNHApeostr5B2r3BG+X6t4TNt JmHVsjUmR8XMyAUTRP24yMzDWPCmU3OxBzyZojVF9Y7wMbQatcbV00m0y2xHuYMbj3J7 Rnk6At/G6YhKwqmCnbKrZIKoxcWwqHCYN/UftWdIm29BaeMO9GUcz6K3+W9f7FwMfgnV Sq7Y1oKo+1sCYJbdKDBQLoQuLN+2hjkSOyft2cWeDS6PKBuKhPRB2++85lm487BTejJ+ CsAw== X-Received: by 10.112.40.36 with SMTP id u4mr2929198lbk.36.1364651608635; Sat, 30 Mar 2013 06:53:28 -0700 (PDT) Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi. [80.223.81.27]) by mx.google.com with ESMTPS id sl5sm2630960lbb.10.2013.03.30.06.53.27 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 30 Mar 2013 06:53:27 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH v2 3/3] cli: conform to same conditional build style as elsewhere in notmuch-show Date: Sat, 30 Mar 2013 15:53:17 +0200 Message-Id: <538bbf4e8113b242e0f193ee4a92ffeaaff1ab71.1364651359.git.jani@nikula.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkEs5+JSWakpqUrhAGi4lj7GyjL9fItKTt8/cv/mJwMmdwCJHgtTA2gqqtLHdVTKwXWUFrH 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, 30 Mar 2013 13:53:33 -0000 Conform to the same style for #ifdef GMIME_ATLEAST_26 conditional builds as elsewhere. There are no functional changes. --- notmuch-show.c | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index c2ec122..62178f7 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -335,6 +335,8 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out, } #ifdef GMIME_ATLEAST_26 + +/* Get signature status string (GMime 2.6) */ static const char* signature_status_to_string (GMimeSignatureStatus x) { @@ -348,25 +350,8 @@ signature_status_to_string (GMimeSignatureStatus x) } return "unknown"; } -#else -static const char* -signer_status_to_string (GMimeSignerStatus x) -{ - switch (x) { - case GMIME_SIGNER_STATUS_NONE: - return "none"; - case GMIME_SIGNER_STATUS_GOOD: - return "good"; - case GMIME_SIGNER_STATUS_BAD: - return "bad"; - case GMIME_SIGNER_STATUS_ERROR: - return "error"; - } - return "unknown"; -} -#endif -#ifdef GMIME_ATLEAST_26 +/* Signature status sprinter (GMime 2.6) */ static void format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) { @@ -441,7 +426,27 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) sp->end (sp); } -#else + +#else /* GMIME_ATLEAST_26 */ + +/* Get signature status string (GMime 2.4) */ +static const char* +signer_status_to_string (GMimeSignerStatus x) +{ + switch (x) { + case GMIME_SIGNER_STATUS_NONE: + return "none"; + case GMIME_SIGNER_STATUS_GOOD: + return "good"; + case GMIME_SIGNER_STATUS_BAD: + return "bad"; + case GMIME_SIGNER_STATUS_ERROR: + return "error"; + } + return "unknown"; +} + +/* Signature status sprinter (GMime 2.4) */ static void format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) { @@ -504,7 +509,8 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) sp->end (sp); } -#endif + +#endif /* GMIME_ATLEAST_26 */ static notmuch_status_t format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, -- 1.7.10.4