[PATCH 4/6] show: Remove unused fields from notmuch_show_format

diff --git a/7d/faf5c85cfa22fd43874c48ca27d2fdc8336412 b/7d/faf5c85cfa22fd43874c48ca27d2fdc8336412
new file mode 100644 (file)
index 0000000..20f5bec
--- /dev/null
+++ b/7d/faf5c85cfa22fd43874c48ca27d2fdc8336412
@@ -0,0 +1,114 @@
+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 5C6D1429E30\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:58:01 -0700 (PDT)\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 tFdPaGBMRozN for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Apr 2012 17:58:00 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4075F431FB6\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:58:00 -0700 (PDT)\r
+X-AuditID: 1209190f-b7f8a6d000000914-ce-4f80e297666f\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 47.63.02324.792E08F4; Sat,  7 Apr 2012 20:57:59 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q380vxcK005096; \r
+       Sat, 7 Apr 2012 20:57:59 -0400\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 q380vwWx002168\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 7 Apr 2012 20:57:59 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1SGgS6-0001SV-9A; Sat, 07 Apr 2012 20:57:58 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/6] show: Remove unused fields from notmuch_show_format\r
+Date: Sat,  7 Apr 2012 20:57:48 -0400\r
+Message-Id: <1333846670-5356-5-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333846670-5356-1-git-send-email-amdragon@mit.edu>\r
+References: <1333846670-5356-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixCmqrTv9UYO/wY7dFhbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXxtcHOxgLZnNXnHxzj6WB8QVHFyMnh4SAicSvB0cYIWwxiQv3\r
+       1rN1MXJxCAnsY5TY/rSVGcJZzyix7PlCFgjnHpPEn8PvGSGc+YwSzw9NAetnE9CQ2LZ/OZgt\r
+       IiAtsfPubNYuRg4OZgE1iT9dKiBhYQEPicfPO1lBbBYBVYl/1++ygNi8AvYS5x9tY4I4Q0Hi\r
+       2brjYDangIPE9tatzCC2EFDN0sXHGScw8i9gZFjFKJuSW6Wbm5iZU5yarFucnJiXl1qka6KX\r
+       m1mil5pSuokRHDaS/DsYvx1UOsQowMGoxMP7eEeDvxBrYllxZe4hRkkOJiVR3qcPgEJ8Sfkp\r
+       lRmJxRnxRaU5qcWHGCU4mJVEeO8fBsrxpiRWVqUW5cOkpDlYlMR51bTe+QkJpCeWpGanphak\r
+       FsFkZTg4lCR4/4IMFSxKTU+tSMvMKUFIM3FwggznARp+7yHI8OKCxNzizHSI/ClGRSlx3n0g\r
+       CQGQREZpHlwvLK5fMYoDvSLMuxukigeYEuC6XwENZgIaXPOqHmRwSSJCSqqBkf2L6qFy32xv\r
+       h8cK1rat8TL7HX7/91ZvPq6zIGWG5pv1u+dVRpp7fd3vssaorfbm32jtq5yVx/b823JrxpzT\r
+       R/oy1b2PbeGaOcm3aH6dUn11eWasSuJ/zRzl8Ns6ufO/sEw8+1aJWayml/uEtXplrUy7mn3i\r
+       2l2vW19rtZXIBpxayy7ReNtUiaU4I9FQi7moOBEAgZEfRMYCAAA=\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: Sun, 08 Apr 2012 00:58:01 -0000\r
+\r
+These fields were only used by old-style formatters.\r
+---\r
+ notmuch-client.h |   23 -----------------------\r
+ 1 files changed, 0 insertions(+), 23 deletions(-)\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index 34155fc..f0fb748 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -70,29 +70,6 @@ typedef struct notmuch_show_format {\r
+     notmuch_status_t (*part) (const void *ctx,\r
+                             struct mime_node *node, int indent,\r
+                             const struct notmuch_show_params *params);\r
+-    const char *message_start;\r
+-    void (*message) (const void *ctx,\r
+-                   notmuch_message_t *message,\r
+-                   int indent);\r
+-    const char *header_start;\r
+-    void (*header) (const void *ctx,\r
+-                  notmuch_message_t *message);\r
+-    void (*header_message_part) (GMimeMessage *message);\r
+-    const char *header_end;\r
+-    const char *body_start;\r
+-    void (*part_start) (GMimeObject *part,\r
+-                      int *part_count);\r
+-    void (*part_encstatus) (int status);\r
+-#ifdef GMIME_ATLEAST_26\r
+-    void (*part_sigstatus) (GMimeSignatureList* siglist);\r
+-#else\r
+-    void (*part_sigstatus) (const GMimeSignatureValidity* validity);\r
+-#endif\r
+-    void (*part_content) (GMimeObject *part);\r
+-    void (*part_end) (GMimeObject *part);\r
+-    const char *part_sep;\r
+-    const char *body_end;\r
+-    const char *message_end;\r
+     const char *message_set_sep;\r
+     const char *message_set_end;\r
+ } notmuch_show_format_t;\r
+-- \r
+1.7.9.1\r
+\r