1c/641b536222ba0e28e418dbac5c11efdd31a259

   1 Return-Path: <amthrax@drake.mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 7BCDD429E30\r
   6         for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 09:34:08 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id RSlmbH07bOTi for <notmuch@notmuchmail.org>;\r
  16         Tue, 14 Feb 2012 09:34:07 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
  18         [18.9.25.13])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 16A35431FBC\r
  20         for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 09:34:03 -0800 (PST)\r
  21 X-AuditID: 1209190d-b7fbf6d0000008ba-93-4f3a9b0acfdc\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id C1.00.02234.A0B9A3F4; Tue, 14 Feb 2012 12:34:02 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q1EHY1B0006054; \r
  27         Tue, 14 Feb 2012 12:34:01 -0500\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1EHY0cR016524\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Tue, 14 Feb 2012 12:34:01 -0500 (EST)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1RxMGO-00027V-0w; Tue, 14 Feb 2012 12:34:00 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 7/8] show: Make format_part_sigstatus_json's API consistent\r
  41         between GMIME 2.4 and 2.6\r
  42 Date: Tue, 14 Feb 2012 12:33:42 -0500\r
  43 Message-Id: <1329240823-7856-8-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.7.3\r
  45 In-Reply-To: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6noss128rf4PJcNYsje2axW1zd2s9u\r
  49         cf3mTGYHZo+ds+6yezxbdYvZo+nHYtYA5igum5TUnMyy1CJ9uwSujDMnRAqmcFd0ve1gbGDs\r
  50         4+xi5OSQEDCROP13KhuELSZx4d56IJuLQ0hgH6PEoUOnGCGcDYwSL/ddYoJw7jNJNEx4CVU2\r
  51         n1FiyvsHLCD9bAIaEtv2L2cEsUUEpCV23p3NCmIzC8RLHGlbDxYXFkiV+L3pEFicRUBV4sOc\r
  52         VcwgNq+AvcTyA8uYIO5QkDi3+hw7iM0p4CCxf99/sHohoJpLd7eyTGDkX8DIsIpRNiW3Sjc3\r
  53         MTOnODVZtzg5MS8vtUjXSC83s0QvNaV0EyMovDgleXcwvjuodIhRgINRiYfXwMLSX4g1say4\r
  54         MvcQoyQHk5Ior/AMK38hvqT8lMqMxOKM+KLSnNTiQ4wSHMxKIrybpgPleFMSK6tSi/JhUtIc\r
  55         LErivKpa7/yEBNITS1KzU1MLUotgsjIcHEoSvEmzgBoFi1LTUyvSMnNKENJMHJwgw3mAhieD\r
  56         1PAWFyTmFmemQ+RPMSpKifN6gCQEQBIZpXlwvbD4f8UoDvSKMG8QSBUPMHXAdb8CGswENHj7\r
  57         aQuQwSWJCCmpBsai/fcYFynGzTJT1XjOfuDbmQ3L9ttK13GeacmSv8MnVB56dV9MbdpCHet/\r
  58         jfrXJul5ZCZOyPvvn/o5XULw/WqtWxdkhR0yDsScVv305dKCfoP068X+jIL+S3Yce7pEe5f1\r
  59         /yOv9Kx1bx3qt/IrEGu1bPU+4tDhzrP/Eetz/baVf4+Lp/v9y1diKc5INNRiLipOBAAJampN\r
  60         2gIAAA==\r
  61 X-BeenThere: notmuch@notmuchmail.org\r
  62 X-Mailman-Version: 2.1.13\r
  63 Precedence: list\r
  64 List-Id: "Use and development of the notmuch mail system."\r
  65         <notmuch.notmuchmail.org>\r
  66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  69 List-Post: <mailto:notmuch@notmuchmail.org>\r
  70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  72         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  73 X-List-Received-Date: Tue, 14 Feb 2012 17:34:09 -0000\r
  74 \r
  75 The implementation is still different for GMIME 2.4 and 2.6, but at\r
  76 least now the caller doesn't have to be aware of this.\r
  77 ---\r
  78  notmuch-show.c |   14 +++++++-------\r
  79  1 files changed, 7 insertions(+), 7 deletions(-)\r
  80 \r
  81 diff --git a/notmuch-show.c b/notmuch-show.c\r
  82 index 8fb6fa6..07276c7 100644\r
  83 --- a/notmuch-show.c\r
  84 +++ b/notmuch-show.c\r
  85 @@ -404,8 +404,10 @@ signer_status_to_string (GMimeSignerStatus x)\r
  86  \r
  87  #ifdef GMIME_ATLEAST_26\r
  88  static void\r
  89 -format_part_sigstatus_json (GMimeSignatureList *siglist)\r
  90 +format_part_sigstatus_json (mime_node_t *node)\r
  91  {\r
  92 +    GMimeSignatureList *siglist = node->sig_list;\r
  93 +\r
  94      printf ("[");\r
  95  \r
  96      if (!siglist) {\r
  97 @@ -470,8 +472,10 @@ format_part_sigstatus_json (GMimeSignatureList *siglist)\r
  98  }\r
  99  #else\r
 100  static void\r
 101 -format_part_sigstatus_json (const GMimeSignatureValidity* validity)\r
 102 +format_part_sigstatus_json (mime_node_t *node)\r
 103  {\r
 104 +    const GMimeSignatureValidity* validity = node->sig_validity;\r
 105 +\r
 106      printf ("[");\r
 107  \r
 108      if (!validity) {\r
 109 @@ -696,11 +700,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
 110  \r
 111      if (node->verify_attempted) {\r
 112         printf (", \"sigstatus\": ");\r
 113 -#ifdef GMIME_ATLEAST_26\r
 114 -       format_part_sigstatus_json (node->sig_list);\r
 115 -#else\r
 116 -       format_part_sigstatus_json (node->sig_validity);\r
 117 -#endif\r
 118 +       format_part_sigstatus_json (node);\r
 119      }\r
 120  \r
 121      printf (", \"content-type\": %s",\r
 122 -- \r
 123 1.7.7.3\r
 124 \r