[PATCH 7/8] show: Make format_part_sigstatus_json's API consistent between GMIME...

diff --git a/1c/641b536222ba0e28e418dbac5c11efdd31a259 b/1c/641b536222ba0e28e418dbac5c11efdd31a259
new file mode 100644 (file)
index 0000000..151d85a
--- /dev/null
+++ b/1c/641b536222ba0e28e418dbac5c11efdd31a259
@@ -0,0 +1,124 @@
+Return-Path: <amthrax@drake.mit.edu>\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 7BCDD429E30\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 09:34:08 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\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 RSlmbH07bOTi for <notmuch@notmuchmail.org>;\r
+       Tue, 14 Feb 2012 09:34:07 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+       [18.9.25.13])\r
+       by olra.theworths.org (Postfix) with ESMTP id 16A35431FBC\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 09:34:03 -0800 (PST)\r
+X-AuditID: 1209190d-b7fbf6d0000008ba-93-4f3a9b0acfdc\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id C1.00.02234.A0B9A3F4; Tue, 14 Feb 2012 12:34:02 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q1EHY1B0006054; \r
+       Tue, 14 Feb 2012 12:34:01 -0500\r
+Received: from drake.mit.edu\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1EHY0cR016524\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 14 Feb 2012 12:34:01 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1RxMGO-00027V-0w; Tue, 14 Feb 2012 12:34:00 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 7/8] show: Make format_part_sigstatus_json's API consistent\r
+       between GMIME 2.4 and 2.6\r
+Date: Tue, 14 Feb 2012 12:33:42 -0500\r
+Message-Id: <1329240823-7856-8-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
+References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6noss128rf4PJcNYsje2axW1zd2s9u\r
+       cf3mTGYHZo+ds+6yezxbdYvZo+nHYtYA5igum5TUnMyy1CJ9uwSujDMnRAqmcFd0ve1gbGDs\r
+       4+xi5OSQEDCROP13KhuELSZx4d56IJuLQ0hgH6PEoUOnGCGcDYwSL/ddYoJw7jNJNEx4CVU2\r
+       n1FiyvsHLCD9bAIaEtv2L2cEsUUEpCV23p3NCmIzC8RLHGlbDxYXFkiV+L3pEFicRUBV4sOc\r
+       VcwgNq+AvcTyA8uYIO5QkDi3+hw7iM0p4CCxf99/sHohoJpLd7eyTGDkX8DIsIpRNiW3Sjc3\r
+       MTOnODVZtzg5MS8vtUjXSC83s0QvNaV0EyMovDgleXcwvjuodIhRgINRiYfXwMLSX4g1say4\r
+       MvcQoyQHk5Ior/AMK38hvqT8lMqMxOKM+KLSnNTiQ4wSHMxKIrybpgPleFMSK6tSi/JhUtIc\r
+       LErivKpa7/yEBNITS1KzU1MLUotgsjIcHEoSvEmzgBoFi1LTUyvSMnNKENJMHJwgw3mAhieD\r
+       1PAWFyTmFmemQ+RPMSpKifN6gCQEQBIZpXlwvbD4f8UoDvSKMG8QSBUPMHXAdb8CGswENHj7\r
+       aQuQwSWJCCmpBsai/fcYFynGzTJT1XjOfuDbmQ3L9ttK13GeacmSv8MnVB56dV9MbdpCHet/\r
+       jfrXJul5ZCZOyPvvn/o5XULw/WqtWxdkhR0yDsScVv305dKCfoP068X+jIL+S3Yce7pEe5f1\r
+       /yOv9Kx1bx3qt/IrEGu1bPU+4tDhzrP/Eetz/baVf4+Lp/v9y1diKc5INNRiLipOBAAJampN\r
+       2gIAAA==\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: Tue, 14 Feb 2012 17:34:09 -0000\r
+\r
+The implementation is still different for GMIME 2.4 and 2.6, but at\r
+least now the caller doesn't have to be aware of this.\r
+---\r
+ notmuch-show.c |   14 +++++++-------\r
+ 1 files changed, 7 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 8fb6fa6..07276c7 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -404,8 +404,10 @@ signer_status_to_string (GMimeSignerStatus x)\r
+ \r
+ #ifdef GMIME_ATLEAST_26\r
+ static void\r
+-format_part_sigstatus_json (GMimeSignatureList *siglist)\r
++format_part_sigstatus_json (mime_node_t *node)\r
+ {\r
++    GMimeSignatureList *siglist = node->sig_list;\r
++\r
+     printf ("[");\r
+ \r
+     if (!siglist) {\r
+@@ -470,8 +472,10 @@ format_part_sigstatus_json (GMimeSignatureList *siglist)\r
+ }\r
+ #else\r
+ static void\r
+-format_part_sigstatus_json (const GMimeSignatureValidity* validity)\r
++format_part_sigstatus_json (mime_node_t *node)\r
+ {\r
++    const GMimeSignatureValidity* validity = node->sig_validity;\r
++\r
+     printf ("[");\r
+ \r
+     if (!validity) {\r
+@@ -696,11 +700,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
+ \r
+     if (node->verify_attempted) {\r
+       printf (", \"sigstatus\": ");\r
+-#ifdef GMIME_ATLEAST_26\r
+-      format_part_sigstatus_json (node->sig_list);\r
+-#else\r
+-      format_part_sigstatus_json (node->sig_validity);\r
+-#endif\r
++      format_part_sigstatus_json (node);\r
+     }\r
+ \r
+     printf (", \"content-type\": %s",\r
+-- \r
+1.7.7.3\r
+\r