1 Return-Path: <jrollins@servo.finestructure.net>
\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 86B19429E28
\r
6 for <notmuch@notmuchmail.org>; Wed, 8 Jun 2011 12:30:17 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5
\r
12 tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id tWhMMhbVz7SW for <notmuch@notmuchmail.org>;
\r
17 Wed, 8 Jun 2011 12:30:16 -0700 (PDT)
\r
18 Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu
\r
20 by olra.theworths.org (Postfix) with ESMTP id C3A85429E25
\r
21 for <notmuch@notmuchmail.org>; Wed, 8 Jun 2011 12:30:16 -0700 (PDT)
\r
22 Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
23 by earth-doxen-postvirus (Postfix) with ESMTP id 3341E66E02B9;
\r
24 Wed, 8 Jun 2011 12:30:15 -0700 (PDT)
\r
25 X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new
\r
26 Received: from servo.finestructure.net (gwave-108.ligo.caltech.edu
\r
27 [131.215.114.108]) (Authenticated sender: jrollins)
\r
28 by earth-doxen-submit (Postfix) with ESMTP id CE26766E0474;
\r
29 Wed, 8 Jun 2011 12:30:11 -0700 (PDT)
\r
30 Received: by servo.finestructure.net (Postfix, from userid 1000)
\r
31 id E51A56F3; Wed, 8 Jun 2011 12:30:12 -0700 (PDT)
\r
32 From: Jameson Graef Rollins <jrollins@finestructure.net>
\r
33 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
34 Subject: [PATCH 2/4] Fix notmuch-reply to not output "Non-text part:" lines
\r
35 for non-leafnode parts.
\r
36 Date: Wed, 8 Jun 2011 12:30:07 -0700
\r
37 Message-Id: <1307561409-5646-3-git-send-email-jrollins@finestructure.net>
\r
38 X-Mailer: git-send-email 1.7.5.3
\r
39 In-Reply-To: <1307561409-5646-2-git-send-email-jrollins@finestructure.net>
\r
40 References: <1307320169-29905-4-git-send-email-jrollins@finestructure.net>
\r
41 <1307561409-5646-1-git-send-email-jrollins@finestructure.net>
\r
42 <1307561409-5646-2-git-send-email-jrollins@finestructure.net>
\r
43 X-BeenThere: notmuch@notmuchmail.org
\r
44 X-Mailman-Version: 2.1.13
\r
46 List-Id: "Use and development of the notmuch mail system."
\r
47 <notmuch.notmuchmail.org>
\r
48 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
50 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
51 List-Post: <mailto:notmuch@notmuchmail.org>
\r
52 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
53 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
55 X-List-Received-Date: Wed, 08 Jun 2011 19:30:17 -0000
\r
57 These lines are just cruft in this case, and can be removed.
\r
59 notmuch-reply.c | 11 ++++++-----
\r
60 1 files changed, 6 insertions(+), 5 deletions(-)
\r
62 diff --git a/notmuch-reply.c b/notmuch-reply.c
\r
63 index a19eb19..7a76ba3 100644
\r
64 --- a/notmuch-reply.c
\r
65 +++ b/notmuch-reply.c
\r
66 @@ -93,7 +93,12 @@ reply_part_content (GMimeObject *part)
\r
67 GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
\r
68 GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
\r
70 - if (g_mime_content_type_is_type (content_type, "text", "*") &&
\r
71 + if (g_mime_content_type_is_type (content_type, "multipart", "*") ||
\r
72 + g_mime_content_type_is_type (content_type, "message", "rfc822"))
\r
74 + /* Output nothing, since multipart subparts will be handled individually. */
\r
76 + else if (g_mime_content_type_is_type (content_type, "text", "*") &&
\r
77 !g_mime_content_type_is_type (content_type, "text", "html"))
\r
79 GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
\r
80 @@ -120,10 +125,6 @@ reply_part_content (GMimeObject *part)
\r
82 g_object_unref(stream_stdout);
\r
84 - else if (g_mime_content_type_is_type (content_type, "message", "rfc822"))
\r
86 - /* Output nothing, since rfc822 subparts will be handled individually. */
\r