1 Return-Path: <tomi.ollila@iki.fi>
\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 E21BD431E84
\r
6 for <notmuch@notmuchmail.org>; Mon, 11 Nov 2013 06:59:29 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 t8enFY4Es3L8 for <notmuch@notmuchmail.org>;
\r
16 Mon, 11 Nov 2013 06:59:25 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id BC014431FD2
\r
19 for <notmuch@notmuchmail.org>; Mon, 11 Nov 2013 06:59:25 -0800 (PST)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 499F7100033;
\r
22 Mon, 11 Nov 2013 16:59:19 +0200 (EET)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: David Bremner <david@tethera.net>,
\r
25 Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
\r
26 notmuch <notmuch@notmuchmail.org>
\r
27 Subject: Re: fix for failing tests with gmime 2.6.19
\r
28 In-Reply-To: <87iovzywua.fsf@zancas.localnet>
\r
29 References: <1384100482-15453-1-git-send-email-david@tethera.net>
\r
30 <52805350.70004@fifthhorseman.net> <87iovzywua.fsf@zancas.localnet>
\r
31 User-Agent: Notmuch/0.16+119~g219c55f (http://notmuchmail.org) Emacs/24.3.1
\r
32 (x86_64-unknown-linux-gnu)
\r
33 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
34 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
35 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
36 Date: Mon, 11 Nov 2013 16:59:18 +0200
\r
37 Message-ID: <m2txfjyoft.fsf@guru.guru-group.fi>
\r
39 Content-Type: text/plain
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Mon, 11 Nov 2013 14:59:30 -0000
\r
54 On Mon, Nov 11 2013, David Bremner <david@tethera.net> wrote:
\r
56 > Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
\r
59 >> Please don't introduce this cruft into the notmuch codebase. It should
\r
60 >> be fixed in gmime, not worked-around notmuch.
\r
62 >> I've just uploaded gmime 2.6.19-2 to unstable to address this issue.
\r
67 > Thanks a lot for that.
\r
69 > What I (still) wonder about is all the people not running Debian, in the
\r
70 > interval between the release of notmuch 0.17 and the next upstream
\r
71 > release of gmime (and propagation to various distros). Even on Debian,
\r
72 > building on testing and backports complicates things a bit.
\r
74 Something like this could also be used...
\r
76 diff --git a/notmuch-reply.c b/notmuch-reply.c
\r
77 index 9d6f843..2ab0f6e 100644
\r
78 --- a/notmuch-reply.c
\r
79 +++ b/notmuch-reply.c
\r
82 show_reply_headers (GMimeMessage *message)
\r
84 +#if ! GMIME_CHECK_VERSION(2,6,19)
\r
85 GMimeStream *stream_stdout = NULL;
\r
87 stream_stdout = g_mime_stream_file_new (stdout);
\r
88 @@ -35,6 +36,17 @@ show_reply_headers (GMimeMessage *message)
\r
89 g_mime_object_write_to_stream (GMIME_OBJECT(message), stream_stdout);
\r
90 g_object_unref(stream_stdout);
\r
93 + char * msg = g_mime_object_to_string (GMIME_OBJECT(message));
\r
94 + char * rp = strstr (msg, "References: ");
\r
96 + fwrite (msg, 1, rp - msg + 12, stdout); // Up to 'References: '
\r
97 + fputs (rp + 13, stdout);
\r
100 + fputs (msg, stdout);
\r