Re: [PATCH v3 0/3] Clean up reply's encoding story

diff --git a/18/e8f4042cda408434b2d0c0a27134629fff1c1a b/18/e8f4042cda408434b2d0c0a27134629fff1c1a
new file mode 100644 (file)
index 0000000..719ddc0
--- /dev/null
+++ b/18/e8f4042cda408434b2d0c0a27134629fff1c1a
@@ -0,0 +1,120 @@
+Return-Path: <tomi.ollila@iki.fi>\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 13BEF429E42\r
+       for <notmuch@notmuchmail.org>; Fri, 16 Aug 2013 13:27:29 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 M8eADsbr+jKt for <notmuch@notmuchmail.org>;\r
+       Fri, 16 Aug 2013 13:27:21 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 02889429E3A\r
+       for <notmuch@notmuchmail.org>; Fri, 16 Aug 2013 13:27:20 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id C22BC100051;\r
+       Fri, 16 Aug 2013 23:27:14 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, Austin Clements <amdragon@MIT.EDU>,\r
+       notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3 0/3] Clean up reply's encoding story\r
+In-Reply-To: <87fvu93ahu.fsf@nikula.org>\r
+References: <1376667343-10863-1-git-send-email-amdragon@mit.edu>\r
+       <87fvu93ahu.fsf@nikula.org>\r
+User-Agent: Notmuch/0.16+3~g340c058 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 16 Aug 2013 23:27:14 +0300\r
+Message-ID: <m2mwohwfdp.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Fri, 16 Aug 2013 20:27:29 -0000\r
+\r
+On Fri, Aug 16 2013, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> On Fri, 16 Aug 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+>> This is v3 of id:1376587658-19202-1-git-send-email-amdragon@mit.edu.\r
+>> This addresses Jani's comment in id:87k3jl3ehe.fsf@nikula.org by\r
+>> treating errors while retrieving the original message's References\r
+>> header as if the original message didn't have a References header.  It\r
+>> also adds a comment suggested by Jani on IRC.  The diff from v2 is\r
+>> below.\r
+>\r
+> The series LGTM, and I in particular welcome the diffstat in patch 3!\r
+\r
+The series LGTM, and I in particular welcome the diffstat in patch 3!\r
+\r
+> BR,\r
+> Jani.\r
+\r
+Tomi\r
+\r
+>\r
+>\r
+>>\r
+>> diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+>> index bfd0f51..ac46d02 100644\r
+>> --- a/notmuch-reply.c\r
+>> +++ b/notmuch-reply.c\r
+>> @@ -31,6 +31,7 @@ show_reply_headers (GMimeMessage *message)\r
+>>      stream_stdout = g_mime_stream_file_new (stdout);\r
+>>      if (stream_stdout) {\r
+>>     g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
+>> +   /* Output RFC 2822 formatted (and RFC 2047 encoded) headers. */\r
+>>     g_mime_object_write_to_stream (GMIME_OBJECT(message), stream_stdout);\r
+>>     g_object_unref(stream_stdout);\r
+>>      }\r
+>> @@ -526,14 +527,15 @@ create_reply_message(void *ctx,\r
+>>                           "In-Reply-To", in_reply_to);\r
+>>  \r
+>>      orig_references = notmuch_message_get_header (message, "references");\r
+>> -    if (orig_references) {\r
+>> -   references = talloc_asprintf (ctx, "%s%s%s",\r
+>> -                                 *orig_references ? orig_references : "",\r
+>> -                                 *orig_references ? " " : "",\r
+>> -                                 in_reply_to);\r
+>> -   g_mime_object_set_header (GMIME_OBJECT (reply),\r
+>> -                             "References", references);\r
+>> -    }\r
+>> +    if (!orig_references)\r
+>> +   /* Treat errors like missing References headers. */\r
+>> +   orig_references = "";\r
+>> +    references = talloc_asprintf (ctx, "%s%s%s",\r
+>> +                             *orig_references ? orig_references : "",\r
+>> +                             *orig_references ? " " : "",\r
+>> +                             in_reply_to);\r
+>> +    g_mime_object_set_header (GMIME_OBJECT (reply),\r
+>> +                         "References", references);\r
+>>  \r
+>>      return reply;\r
+>>  }\r
+>>\r
+>>\r
+>> _______________________________________________\r
+>> notmuch mailing list\r
+>> notmuch@notmuchmail.org\r
+>> http://notmuchmail.org/mailman/listinfo/notmuch\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r