[PATCH 4/5] show: Move format_part_content_raw with the other new-style formats

diff --git a/e0/51eaf45f89ee514a0abecc037651cb51556dad b/e0/51eaf45f89ee514a0abecc037651cb51556dad
new file mode 100644 (file)
index 0000000..fe06240
--- /dev/null
+++ b/e0/51eaf45f89ee514a0abecc037651cb51556dad
@@ -0,0 +1,153 @@
+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 A77E4431FC3\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 21:20:40 -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 qIsQI1IkaW9l for <notmuch@notmuchmail.org>;\r
+       Fri,  2 Mar 2012 21:20:38 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+       [18.9.25.14])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4CBB5431FC4\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 21:20:33 -0800 (PST)\r
+X-AuditID: 1209190e-b7f7c6d0000008c3-7a-4f51aa211d7a\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 02.37.02243.12AA15F4; Sat,  3 Mar 2012 00:20:33 -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 q235KW9h030587; \r
+       Sat, 3 Mar 2012 00:20:32 -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 q235KUeE022256\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 3 Mar 2012 00:20:31 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1S3hOQ-0000h4-Qo; Sat, 03 Mar 2012 00:20:30 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/5] show: Move format_part_content_raw with the other\r
+       new-style formats\r
+Date: Sat,  3 Mar 2012 00:20:24 -0500\r
+Message-Id: <1330752025-2542-5-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1330752025-2542-1-git-send-email-amdragon@mit.edu>\r
+References: <1330752025-2542-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6noqu4KtDf4Mg2dovrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoErY/uX9UwFqwUrNs88wd7AOJ2vi5GDQ0LARKL5SFgXIyeQKSZx\r
+       4d56ti5GLg4hgX2MEov2fGeGcNYzSsy80MUI4dxjktg1YzYLhDOfUaL/ZgcbSD+bgIbEtv3L\r
+       GUFsEQFpiZ13Z7OCrGAWUJP406UCEhYWiJC4eXgqWAmLgKrEhW3XWUFsXgF7iRlzprNAnKEg\r
+       cW71OXYQm1PAQaLl+DGwGiGgmh/9nSwTGPkXMDKsYpRNya3SzU3MzClOTdYtTk7My0st0jXW\r
+       y80s0UtNKd3ECAoaTkm+HYxfDyodYhTgYFTi4b30MsBfiDWxrLgy9xCjJAeTkihv+fJAfyG+\r
+       pPyUyozE4oz4otKc1OJDjBIczEoivMs8gXK8KYmVValF+TApaQ4WJXFeNa13fkIC6Yklqdmp\r
+       qQWpRTBZGQ4OJQneqJVAjYJFqempFWmZOSUIaSYOTpDhPEDDW0FqeIsLEnOLM9Mh8qcYFaXE\r
+       eXNBEgIgiYzSPLheWFS/YhQHekWYNwCkigeYEOC6XwENZgIavPiyH8jgkkSElFQD47qbZy/I\r
+       m2QdjNrGff/4h6vdC95yf/80mVn65NTCa74bEtTla6dN6Vn84PWMjt0SRzaLKB1n5/yr0J0z\r
+       d+2G+VWXPLme+skeXbanzdnv1Ffhbc7z+zQXhG1/n6EYIH1T1509IeGP/A7dCzsWe8nxidkJ\r
+       LF4af0IlyjTAl11+YtSkyvtXwvl93ZVYijMSDbWYi4oTAYiFwZPFAgAA\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: Sat, 03 Mar 2012 05:20:41 -0000\r
+\r
+Just code motion.\r
+---\r
+ notmuch-show.c |   54 +++++++++++++++++++++++++++---------------------------\r
+ 1 files changed, 27 insertions(+), 27 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 72c141e..6f6052c 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -475,33 +475,6 @@ format_part_sigstatus_json (mime_node_t *node)\r
+ }\r
+ #endif\r
+ \r
+-static void\r
+-format_part_content_raw (GMimeObject *part)\r
+-{\r
+-    if (! GMIME_IS_PART (part))\r
+-      return;\r
+-\r
+-    GMimeStream *stream_stdout;\r
+-    GMimeStream *stream_filter = NULL;\r
+-    GMimeDataWrapper *wrapper;\r
+-\r
+-    stream_stdout = g_mime_stream_file_new (stdout);\r
+-    g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
+-\r
+-    stream_filter = g_mime_stream_filter_new (stream_stdout);\r
+-\r
+-    wrapper = g_mime_part_get_content_object (GMIME_PART (part));\r
+-\r
+-    if (wrapper && stream_filter)\r
+-      g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);\r
+-\r
+-    if (stream_filter)\r
+-      g_object_unref (stream_filter);\r
+-\r
+-    if (stream_stdout)\r
+-      g_object_unref(stream_stdout);\r
+-}\r
+-\r
+ static notmuch_status_t\r
+ format_part_text (const void *ctx, mime_node_t *node,\r
+                 int indent, const notmuch_show_params_t *params)\r
+@@ -758,6 +731,33 @@ format_part_mbox (const void *ctx, mime_node_t *node, unused (int indent),\r
+     return NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+ \r
++static void\r
++format_part_content_raw (GMimeObject *part)\r
++{\r
++    if (! GMIME_IS_PART (part))\r
++      return;\r
++\r
++    GMimeStream *stream_stdout;\r
++    GMimeStream *stream_filter = NULL;\r
++    GMimeDataWrapper *wrapper;\r
++\r
++    stream_stdout = g_mime_stream_file_new (stdout);\r
++    g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
++\r
++    stream_filter = g_mime_stream_filter_new (stream_stdout);\r
++\r
++    wrapper = g_mime_part_get_content_object (GMIME_PART (part));\r
++\r
++    if (wrapper && stream_filter)\r
++      g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);\r
++\r
++    if (stream_filter)\r
++      g_object_unref (stream_filter);\r
++\r
++    if (stream_stdout)\r
++      g_object_unref(stream_stdout);\r
++}\r
++\r
+ static notmuch_status_t\r
+ show_message (void *ctx,\r
+             const notmuch_show_format_t *format,\r
+-- \r
+1.7.7.3\r
+\r