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