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

diff --git a/68/81104cb0f7fcbc61abc8b43aa689d4e5835c1a b/68/81104cb0f7fcbc61abc8b43aa689d4e5835c1a
new file mode 100644 (file)
index 0000000..97aa181
--- /dev/null
+++ b/68/81104cb0f7fcbc61abc8b43aa689d4e5835c1a
@@ -0,0 +1,125 @@
+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 474EB431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:38 -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 7XLZKy86g0OZ for <notmuch@notmuchmail.org>;\r
+       Sun, 19 Feb 2012 16:26:37 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 55D42431FB6\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:36 -0800 (PST)\r
+X-AuditID: 12074422-b7fd66d0000008f9-c1-4f41933b2f9d\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id EF.F5.02297.B33914F4; Sun, 19 Feb 2012 19:26:35 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZI4016445; \r
+       Sun, 19 Feb 2012 19:26:35 -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 q1K0QYLL000304\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 19 Feb 2012 19:26:35 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1RzH5O-0001yU-1a; Sun, 19 Feb 2012 19:26:34 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 7/8] show: Make format_part_sigstatus_json's API consistent\r
+       between GMIME 2.4 and 2.6\r
+Date: Sun, 19 Feb 2012 19:26:29 -0500\r
+Message-Id: <1329697590-7404-8-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
+References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
+       <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixCmqrGs92dHf4M4JQ4vrN2cyW7xZOY/V\r
+       gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mo4c0KkYAp3RdfbDsYGxj7OLkZODgkBE4me\r
+       3zOZIGwxiQv31rN1MXJxCAnsY5Q4fHsrK4SzgVGi8e5sVpAqIYH7TBJtM7QhEvMZJTY9eAOW\r
+       YBPQkNi2fzkjiC0iIC2xE6qBWcBK4vDVTWC2sECGxPEX25i7GDk4WARUJW4dzgUJ8wrYS6x4\r
+       vg7qCgWJc6vPsYOUcAo4SKze4QqxtlTiyJMtTBMY+RcwMqxilE3JrdLNTczMKU5N1i1OTszL\r
+       Sy3SNdXLzSzRS00p3cQICiJ2F6UdjD8PKh1iFOBgVOLhlSxz8BdiTSwrrsw9xCjJwaQkyntq\r
+       gqO/EF9SfkplRmJxRnxRaU5q8SFGCQ5mJRHeBfZAOd6UxMqq1KJ8mJQ0B4uSOK+61js/IYH0\r
+       xJLU7NTUgtQimKwMB4eSBO+uSUCNgkWp6akVaZk5JQhpJg5OkOE8QMOvgdTwFhck5hZnpkPk\r
+       TzEqSonz7gdJCIAkMkrz4HphUf6KURzoFWHeNJAqHmCCgOt+BTSYCWgwr5AdyOCSRISUVANj\r
+       gODDDoHyb9nXhQ9d2ZPx0tJH7Cbn1vWqa6Mfqpcu9vDs8jyRxZ66Y/mhH3OXP7bwP1Tx86CN\r
+       9cTOZyld4Typu3OtZzhZB13Ve3dr2jR5R/EKT+ONj5fx9quHVVhdvX3sJm/7cXsrpw/1/acZ\r
+       yu31+AXE9BTf7vrusTSeZ6JZ5j/lgjr2jY1KLMUZiYZazEXFiQCPiffIzQIAAA==\r
+Cc: tomi.ollila@iki.fi\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: Mon, 20 Feb 2012 00:26:38 -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