From 9e0444be3bfe43eb1fc88fccc0523a4bfd62f622 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 20 Feb 2012 19:26:29 +1900 Subject: [PATCH] [PATCH v2 7/8] show: Make format_part_sigstatus_json's API consistent between GMIME 2.4 and 2.6 --- 68/81104cb0f7fcbc61abc8b43aa689d4e5835c1a | 125 ++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 68/81104cb0f7fcbc61abc8b43aa689d4e5835c1a diff --git a/68/81104cb0f7fcbc61abc8b43aa689d4e5835c1a b/68/81104cb0f7fcbc61abc8b43aa689d4e5835c1a new file mode 100644 index 000000000..97aa18137 --- /dev/null +++ b/68/81104cb0f7fcbc61abc8b43aa689d4e5835c1a @@ -0,0 +1,125 @@ +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 474EB431FAE + for ; Sun, 19 Feb 2012 16:26:38 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +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 7XLZKy86g0OZ for ; + Sun, 19 Feb 2012 16:26:37 -0800 (PST) +Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU + [18.7.68.34]) + by olra.theworths.org (Postfix) with ESMTP id 55D42431FB6 + for ; Sun, 19 Feb 2012 16:26:36 -0800 (PST) +X-AuditID: 12074422-b7fd66d0000008f9-c1-4f41933b2f9d +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP + id EF.F5.02297.B33914F4; Sun, 19 Feb 2012 19:26:35 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZI4016445; + Sun, 19 Feb 2012 19:26:35 -0500 +Received: from drake.mit.edu + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1K0QYLL000304 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sun, 19 Feb 2012 19:26:35 -0500 (EST) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1RzH5O-0001yU-1a; Sun, 19 Feb 2012 19:26:34 -0500 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 7/8] show: Make format_part_sigstatus_json's API consistent + between GMIME 2.4 and 2.6 +Date: Sun, 19 Feb 2012 19:26:29 -0500 +Message-Id: <1329697590-7404-8-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.7.3 +In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu> +References: <1329240823-7856-1-git-send-email-amdragon@mit.edu> + <1329697590-7404-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixCmqrGs92dHf4M4JQ4vrN2cyW7xZOY/V + gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mo4c0KkYAp3RdfbDsYGxj7OLkZODgkBE4me + 3zOZIGwxiQv31rN1MXJxCAnsY5Q4fHsrK4SzgVGi8e5sVpAqIYH7TBJtM7QhEvMZJTY9eAOW + YBPQkNi2fzkjiC0iIC2xE6qBWcBK4vDVTWC2sECGxPEX25i7GDk4WARUJW4dzgUJ8wrYS6x4 + vg7qCgWJc6vPsYOUcAo4SKze4QqxtlTiyJMtTBMY+RcwMqxilE3JrdLNTczMKU5N1i1OTszL + Sy3SNdXLzSzRS00p3cQICiJ2F6UdjD8PKh1iFOBgVOLhlSxz8BdiTSwrrsw9xCjJwaQkyntq + gqO/EF9SfkplRmJxRnxRaU5q8SFGCQ5mJRHeBfZAOd6UxMqq1KJ8mJQ0B4uSOK+61js/IYH0 + xJLU7NTUgtQimKwMB4eSBO+uSUCNgkWp6akVaZk5JQhpJg5OkOE8QMOvgdTwFhck5hZnpkPk + TzEqSonz7gdJCIAkMkrz4HphUf6KURzoFWHeNJAqHmCCgOt+BTSYCWgwr5AdyOCSRISUVANj + gODDDoHyb9nXhQ9d2ZPx0tJH7Cbn1vWqa6Mfqpcu9vDs8jyRxZ66Y/mhH3OXP7bwP1Tx86CN + 9cTOZyld4Typu3OtZzhZB13Ve3dr2jR5R/EKT+ONj5fx9quHVVhdvX3sJm/7cXsrpw/1/acZ + yu31+AXE9BTf7vrusTSeZ6JZ5j/lgjr2jY1KLMUZiYZazEXFiQCPiffIzQIAAA== +Cc: tomi.ollila@iki.fi +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: Mon, 20 Feb 2012 00:26:38 -0000 + +The implementation is still different for GMIME 2.4 and 2.6, but at +least now the caller doesn't have to be aware of this. +--- + notmuch-show.c | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/notmuch-show.c b/notmuch-show.c +index 8fb6fa6..07276c7 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -404,8 +404,10 @@ signer_status_to_string (GMimeSignerStatus x) + + #ifdef GMIME_ATLEAST_26 + static void +-format_part_sigstatus_json (GMimeSignatureList *siglist) ++format_part_sigstatus_json (mime_node_t *node) + { ++ GMimeSignatureList *siglist = node->sig_list; ++ + printf ("["); + + if (!siglist) { +@@ -470,8 +472,10 @@ format_part_sigstatus_json (GMimeSignatureList *siglist) + } + #else + static void +-format_part_sigstatus_json (const GMimeSignatureValidity* validity) ++format_part_sigstatus_json (mime_node_t *node) + { ++ const GMimeSignatureValidity* validity = node->sig_validity; ++ + printf ("["); + + if (!validity) { +@@ -696,11 +700,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first) + + if (node->verify_attempted) { + printf (", \"sigstatus\": "); +-#ifdef GMIME_ATLEAST_26 +- format_part_sigstatus_json (node->sig_list); +-#else +- format_part_sigstatus_json (node->sig_validity); +-#endif ++ format_part_sigstatus_json (node); + } + + printf (", \"content-type\": %s", +-- +1.7.7.3 + -- 2.26.2