46/49e5e55daaceafb9f105a88d937b9307ab4e03

   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 C4386431FD7\r
   6         for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:48:53 -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 tzf-IFRwum6a for <notmuch@notmuchmail.org>;\r
  16         Tue,  6 Mar 2012 10:48:52 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
  18         [18.9.25.14])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 12075431FD0\r
  20         for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:48:52 -0800 (PST)\r
  21 X-AuditID: 1209190e-b7f7c6d0000008c3-51-4f565c133d97\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id B5.70.02243.31C565F4; Tue,  6 Mar 2012 13:48:51 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q26Impai022026; \r
  27         Tue, 6 Mar 2012 13:48:51 -0500\r
  28 Received: from drake.mit.edu (firewall.royalsociety.org [193.63.75.2])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q26ImmiA016466\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Tue, 6 Mar 2012 13:48:50 -0500 (EST)\r
  34 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amthrax@drake.mit.edu>)\r
  36         id 1S4zRI-0003pV-Dw; Tue, 06 Mar 2012 18:48:48 +0000\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH v2 6/8] show: Move format_part_content_raw with the other\r
  40         new-style formats\r
  41 Date: Tue,  6 Mar 2012 18:48:42 +0000\r
  42 Message-Id: <1331059724-14653-7-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.7.3\r
  44 In-Reply-To: <1331059724-14653-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1330752025-2542-1-git-send-email-amdragon@mit.edu>\r
  46         <1331059724-14653-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixCmqrSscE+ZvMLFT3WLPPi+L6zdnMjsw\r
  49         edw9zeXxbNUt5gCmKC6blNSczLLUIn27BK6M7V/WMxWsFqzYPPMEewPjdL4uRk4OCQETiZ3v\r
  50         G1khbDGJC/fWs3UxcnEICexjlLi3exkzSEJIYD2jxLcXfhCJg0wSzc9PQVXNZ5ToPfyXCaSK\r
  51         TUBDYtv+5YwgtoiAtMTOu7OBxnJwMAs4SbS1eYGEhQWiJXb/aAcbyiKgKvF2+S2wVl4BB4m1\r
  52         O5qgrlCQOLf6HDuIzSngKLHn6SZGiCPKJC7dvMAygZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTE\r
  53         vLzUIl1jvdzMEr3UlNJNjOAgkuTbwfj1oNIhRgEORiUe3ov6Yf5CrIllxZW5hxglOZiURHlz\r
  54         ooBCfEn5KZUZicUZ8UWlOanFhxglOJiVRHi/vQ/1F+JNSaysSi3Kh0lJc7AoifOqab3zExJI\r
  55         TyxJzU5NLUgtgsnKcHAoSfBmRAMNFSxKTU+tSMvMKUFIM3FwggznARpuBFLDW1yQmFucmQ6R\r
  56         P8WoKCXO6weSEABJZJTmwfXCovwVozjQK8K8jiBVPMAEAdf9CmgwE9DgNuVgkMEliQgpqQbG\r
  57         VUfzTI8d2ZuWcVfrwOtLnN+5f72Qd/F3Sq468/bVFLXjgnV8ycop4ecC2bgSAns/CbdJLX4n\r
  58         9pBf6kVV46zV4bdOWjx6vvJpX9DsvbZR66edPOztvu5Vc5d4qNYhry6e/0uVFThmc9646fjN\r
  59         gbFziSvfV63gxCqDdY6O7/e9mikVPilwg4yREktxRqKhFnNRcSIAFQRTGc0CAAA=\r
  60 X-BeenThere: notmuch@notmuchmail.org\r
  61 X-Mailman-Version: 2.1.13\r
  62 Precedence: list\r
  63 List-Id: "Use and development of the notmuch mail system."\r
  64         <notmuch.notmuchmail.org>\r
  65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  66         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  68 List-Post: <mailto:notmuch@notmuchmail.org>\r
  69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  72 X-List-Received-Date: Tue, 06 Mar 2012 18:48:54 -0000\r
  73 \r
  74 Just code motion.\r
  75 ---\r
  76  notmuch-show.c |   54 +++++++++++++++++++++++++++---------------------------\r
  77  1 files changed, 27 insertions(+), 27 deletions(-)\r
  78 \r
  79 diff --git a/notmuch-show.c b/notmuch-show.c\r
  80 index 72c141e..6f6052c 100644\r
  81 --- a/notmuch-show.c\r
  82 +++ b/notmuch-show.c\r
  83 @@ -475,33 +475,6 @@ format_part_sigstatus_json (mime_node_t *node)\r
  84  }\r
  85  #endif\r
  86  \r
  87 -static void\r
  88 -format_part_content_raw (GMimeObject *part)\r
  89 -{\r
  90 -    if (! GMIME_IS_PART (part))\r
  91 -       return;\r
  92 -\r
  93 -    GMimeStream *stream_stdout;\r
  94 -    GMimeStream *stream_filter = NULL;\r
  95 -    GMimeDataWrapper *wrapper;\r
  96 -\r
  97 -    stream_stdout = g_mime_stream_file_new (stdout);\r
  98 -    g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
  99 -\r
 100 -    stream_filter = g_mime_stream_filter_new (stream_stdout);\r
 101 -\r
 102 -    wrapper = g_mime_part_get_content_object (GMIME_PART (part));\r
 103 -\r
 104 -    if (wrapper && stream_filter)\r
 105 -       g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);\r
 106 -\r
 107 -    if (stream_filter)\r
 108 -       g_object_unref (stream_filter);\r
 109 -\r
 110 -    if (stream_stdout)\r
 111 -       g_object_unref(stream_stdout);\r
 112 -}\r
 113 -\r
 114  static notmuch_status_t\r
 115  format_part_text (const void *ctx, mime_node_t *node,\r
 116                   int indent, const notmuch_show_params_t *params)\r
 117 @@ -758,6 +731,33 @@ format_part_mbox (const void *ctx, mime_node_t *node, unused (int indent),\r
 118      return NOTMUCH_STATUS_SUCCESS;\r
 119  }\r
 120  \r
 121 +static void\r
 122 +format_part_content_raw (GMimeObject *part)\r
 123 +{\r
 124 +    if (! GMIME_IS_PART (part))\r
 125 +       return;\r
 126 +\r
 127 +    GMimeStream *stream_stdout;\r
 128 +    GMimeStream *stream_filter = NULL;\r
 129 +    GMimeDataWrapper *wrapper;\r
 130 +\r
 131 +    stream_stdout = g_mime_stream_file_new (stdout);\r
 132 +    g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
 133 +\r
 134 +    stream_filter = g_mime_stream_filter_new (stream_stdout);\r
 135 +\r
 136 +    wrapper = g_mime_part_get_content_object (GMIME_PART (part));\r
 137 +\r
 138 +    if (wrapper && stream_filter)\r
 139 +       g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);\r
 140 +\r
 141 +    if (stream_filter)\r
 142 +       g_object_unref (stream_filter);\r
 143 +\r
 144 +    if (stream_stdout)\r
 145 +       g_object_unref(stream_stdout);\r
 146 +}\r
 147 +\r
 148  static notmuch_status_t\r
 149  show_message (void *ctx,\r
 150               const notmuch_show_format_t *format,\r
 151 -- \r
 152 1.7.7.3\r
 153 \r