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 C4386431FD7 for ; Tue, 6 Mar 2012 10:48:53 -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 tzf-IFRwum6a for ; Tue, 6 Mar 2012 10:48:52 -0800 (PST) Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU [18.9.25.14]) by olra.theworths.org (Postfix) with ESMTP id 12075431FD0 for ; Tue, 6 Mar 2012 10:48:52 -0800 (PST) X-AuditID: 1209190e-b7f7c6d0000008c3-51-4f565c133d97 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id B5.70.02243.31C565F4; Tue, 6 Mar 2012 13:48:51 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q26Impai022026; Tue, 6 Mar 2012 13:48:51 -0500 Received: from drake.mit.edu (firewall.royalsociety.org [193.63.75.2]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q26ImmiA016466 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Tue, 6 Mar 2012 13:48:50 -0500 (EST) Received: from amthrax by drake.mit.edu with local (Exim 4.77) (envelope-from ) id 1S4zRI-0003pV-Dw; Tue, 06 Mar 2012 18:48:48 +0000 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH v2 6/8] show: Move format_part_content_raw with the other new-style formats Date: Tue, 6 Mar 2012 18:48:42 +0000 Message-Id: <1331059724-14653-7-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1331059724-14653-1-git-send-email-amdragon@mit.edu> References: <1330752025-2542-1-git-send-email-amdragon@mit.edu> <1331059724-14653-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixCmqrSscE+ZvMLFT3WLPPi+L6zdnMjsw edw9zeXxbNUt5gCmKC6blNSczLLUIn27BK6M7V/WMxWsFqzYPPMEewPjdL4uRk4OCQETiZ3v G1khbDGJC/fWs3UxcnEICexjlLi3exkzSEJIYD2jxLcXfhCJg0wSzc9PQVXNZ5ToPfyXCaSK TUBDYtv+5YwgtoiAtMTOu7OBxnJwMAs4SbS1eYGEhQWiJXb/aAcbyiKgKvF2+S2wVl4BB4m1 O5qgrlCQOLf6HDuIzSngKLHn6SZGiCPKJC7dvMAygZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTE vLzUIl1jvdzMEr3UlNJNjOAgkuTbwfj1oNIhRgEORiUe3ov6Yf5CrIllxZW5hxglOZiURHlz ooBCfEn5KZUZicUZ8UWlOanFhxglOJiVRHi/vQ/1F+JNSaysSi3Kh0lJc7AoifOqab3zExJI TyxJzU5NLUgtgsnKcHAoSfBmRAMNFSxKTU+tSMvMKUFIM3FwggznARpuBFLDW1yQmFucmQ6R P8WoKCXO6weSEABJZJTmwfXCovwVozjQK8K8jiBVPMAEAdf9CmgwE9DgNuVgkMEliQgpqQbG VUfzTI8d2ZuWcVfrwOtLnN+5f72Qd/F3Sq468/bVFLXjgnV8ycop4ecC2bgSAns/CbdJLX4n 9pBf6kVV46zV4bdOWjx6vvJpX9DsvbZR66edPOztvu5Vc5d4qNYhry6e/0uVFThmc9646fjN gbFziSvfV63gxCqDdY6O7/e9mikVPilwg4yREktxRqKhFnNRcSIAFQRTGc0CAAA= 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: Tue, 06 Mar 2012 18:48:54 -0000 Just code motion. --- notmuch-show.c | 54 +++++++++++++++++++++++++++--------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 72c141e..6f6052c 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -475,33 +475,6 @@ format_part_sigstatus_json (mime_node_t *node) } #endif -static void -format_part_content_raw (GMimeObject *part) -{ - if (! GMIME_IS_PART (part)) - return; - - GMimeStream *stream_stdout; - GMimeStream *stream_filter = NULL; - GMimeDataWrapper *wrapper; - - stream_stdout = g_mime_stream_file_new (stdout); - g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); - - stream_filter = g_mime_stream_filter_new (stream_stdout); - - wrapper = g_mime_part_get_content_object (GMIME_PART (part)); - - if (wrapper && stream_filter) - g_mime_data_wrapper_write_to_stream (wrapper, stream_filter); - - if (stream_filter) - g_object_unref (stream_filter); - - if (stream_stdout) - g_object_unref(stream_stdout); -} - static notmuch_status_t format_part_text (const void *ctx, mime_node_t *node, int indent, const notmuch_show_params_t *params) @@ -758,6 +731,33 @@ format_part_mbox (const void *ctx, mime_node_t *node, unused (int indent), return NOTMUCH_STATUS_SUCCESS; } +static void +format_part_content_raw (GMimeObject *part) +{ + if (! GMIME_IS_PART (part)) + return; + + GMimeStream *stream_stdout; + GMimeStream *stream_filter = NULL; + GMimeDataWrapper *wrapper; + + stream_stdout = g_mime_stream_file_new (stdout); + g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); + + stream_filter = g_mime_stream_filter_new (stream_stdout); + + wrapper = g_mime_part_get_content_object (GMIME_PART (part)); + + if (wrapper && stream_filter) + g_mime_data_wrapper_write_to_stream (wrapper, stream_filter); + + if (stream_filter) + g_object_unref (stream_filter); + + if (stream_stdout) + g_object_unref(stream_stdout); +} + static notmuch_status_t show_message (void *ctx, const notmuch_show_format_t *format, -- 1.7.7.3