[PATCH v2 6/8] show: Move format_part_content_raw with the other new-style formats

diff --git a/46/49e5e55daaceafb9f105a88d937b9307ab4e03 b/46/49e5e55daaceafb9f105a88d937b9307ab4e03
new file mode 100644 (file)
index 0000000..9fe357c
--- /dev/null
+++ b/46/49e5e55daaceafb9f105a88d937b9307ab4e03
@@ -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 C4386431FD7\r
+       for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:48:53 -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 tzf-IFRwum6a for <notmuch@notmuchmail.org>;\r
+       Tue,  6 Mar 2012 10:48:52 -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 12075431FD0\r
+       for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:48:52 -0800 (PST)\r
+X-AuditID: 1209190e-b7f7c6d0000008c3-51-4f565c133d97\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id B5.70.02243.31C565F4; Tue,  6 Mar 2012 13:48:51 -0500 (EST)\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 q26Impai022026; \r
+       Tue, 6 Mar 2012 13:48:51 -0500\r
+Received: from drake.mit.edu (firewall.royalsociety.org [193.63.75.2])\r
+       (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 q26ImmiA016466\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 6 Mar 2012 13:48:50 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1S4zRI-0003pV-Dw; Tue, 06 Mar 2012 18:48:48 +0000\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 6/8] show: Move format_part_content_raw with the other\r
+       new-style formats\r
+Date: Tue,  6 Mar 2012 18:48:42 +0000\r
+Message-Id: <1331059724-14653-7-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1331059724-14653-1-git-send-email-amdragon@mit.edu>\r
+References: <1330752025-2542-1-git-send-email-amdragon@mit.edu>\r
+       <1331059724-14653-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixCmqrSscE+ZvMLFT3WLPPi+L6zdnMjsw\r
+       edw9zeXxbNUt5gCmKC6blNSczLLUIn27BK6M7V/WMxWsFqzYPPMEewPjdL4uRk4OCQETiZ3v\r
+       G1khbDGJC/fWs3UxcnEICexjlLi3exkzSEJIYD2jxLcXfhCJg0wSzc9PQVXNZ5ToPfyXCaSK\r
+       TUBDYtv+5YwgtoiAtMTOu7OBxnJwMAs4SbS1eYGEhQWiJXb/aAcbyiKgKvF2+S2wVl4BB4m1\r
+       O5qgrlCQOLf6HDuIzSngKLHn6SZGiCPKJC7dvMAygZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTE\r
+       vLzUIl1jvdzMEr3UlNJNjOAgkuTbwfj1oNIhRgEORiUe3ov6Yf5CrIllxZW5hxglOZiURHlz\r
+       ooBCfEn5KZUZicUZ8UWlOanFhxglOJiVRHi/vQ/1F+JNSaysSi3Kh0lJc7AoifOqab3zExJI\r
+       TyxJzU5NLUgtgsnKcHAoSfBmRAMNFSxKTU+tSMvMKUFIM3FwggznARpuBFLDW1yQmFucmQ6R\r
+       P8WoKCXO6weSEABJZJTmwfXCovwVozjQK8K8jiBVPMAEAdf9CmgwE9DgNuVgkMEliQgpqQbG\r
+       VUfzTI8d2ZuWcVfrwOtLnN+5f72Qd/F3Sq468/bVFLXjgnV8ycop4ecC2bgSAns/CbdJLX4n\r
+       9pBf6kVV46zV4bdOWjx6vvJpX9DsvbZR66edPOztvu5Vc5d4qNYhry6e/0uVFThmc9646fjN\r
+       gbFziSvfV63gxCqDdY6O7/e9mikVPilwg4yREktxRqKhFnNRcSIAFQRTGc0CAAA=\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: Tue, 06 Mar 2012 18:48:54 -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