7d/b2a8fd09a0426a7a4661723ec6c97dbb535af2

   1 Return-Path: <jani@nikula.org>\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 4D8BF431E82\r
   6         for <notmuch@notmuchmail.org>; Fri, 16 Aug 2013 08:45:36 -0700 (PDT)\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 uaJpWoU0Rt0k for <notmuch@notmuchmail.org>;\r
  16         Fri, 16 Aug 2013 08:45:31 -0700 (PDT)\r
  17 Received: from mail-bk0-f51.google.com (mail-bk0-f51.google.com\r
  18         [209.85.214.51]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id AAE35429E3A\r
  21         for <notmuch@notmuchmail.org>; Fri, 16 Aug 2013 08:45:31 -0700 (PDT)\r
  22 Received: by mail-bk0-f51.google.com with SMTP id mx10so678030bkb.38\r
  23         for <notmuch@notmuchmail.org>; Fri, 16 Aug 2013 08:45:30 -0700 (PDT)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=google.com; s=20120113;\r
  26         h=x-gm-message-state:from:to:cc:subject:in-reply-to:references\r
  27         :user-agent:date:message-id:mime-version:content-type;\r
  28         bh=AgQpkDYjEcDnjxtT1Xu/cilieFEgjrfTHTpGLe8eNoE=;\r
  29         b=pWz2YhTq1aJbFKyg4/42P9ud+6HcfwDghcQF2OoGSPtY+oRv76ftG4LxwtQX/CIxAk\r
  30         6MCjyGXXGdc36eY/G2wvFacr5qvO/H67H4ROB0HYY8LVK3mvJ7kTBnvwb8EGRQcmF0Ir\r
  31         RDHmBkpBfKPimpj8PHowFvklNZQHhu2itwQSloclijRUA0VNeBhw3X3BV1B5XsuY515s\r
  32         ChFmK6+sofviRVMQU7zFLP4mvGmWCFkygFV/iAnJiHMUaERqv/gf49NhCYKaNGT9zClf\r
  33         eQc7FnAczYuAs42x2bh+2FOLhVZ2vlfAqHRxVwzL4v2GJ0L46pwyWLWf4COlL49MnVWU\r
  34         J9Jg==\r
  35 X-Gm-Message-State:\r
  36  ALoCoQmtslgiCgLvuLVxY7eodv9gwO2i6Cz6eH4VKGWSXBmWuqQ0JNm7ZL87r88heQQT/gTbH08n\r
  37 X-Received: by 10.205.10.132 with SMTP id pa4mr1289414bkb.15.1376667930295;\r
  38         Fri, 16 Aug 2013 08:45:30 -0700 (PDT)\r
  39 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  40         [88.195.111.91])\r
  41         by mx.google.com with ESMTPSA id if11sm424185bkc.15.1969.12.31.16.00.00\r
  42         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  43         Fri, 16 Aug 2013 08:45:29 -0700 (PDT)\r
  44 From: Jani Nikula <jani@nikula.org>\r
  45 To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
  46 Subject: Re: [PATCH v3 0/3] Clean up reply's encoding story\r
  47 In-Reply-To: <1376667343-10863-1-git-send-email-amdragon@mit.edu>\r
  48 References: <1376667343-10863-1-git-send-email-amdragon@mit.edu>\r
  49 User-Agent: Notmuch/0.15.2+227~g40b2846 (http://notmuchmail.org) Emacs/24.3.1\r
  50         (x86_64-pc-linux-gnu)\r
  51 Date: Fri, 16 Aug 2013 18:45:33 +0300\r
  52 Message-ID: <87fvu93ahu.fsf@nikula.org>\r
  53 MIME-Version: 1.0\r
  54 Content-Type: text/plain\r
  55 Cc: tomi.ollila@iki.fi\r
  56 X-BeenThere: notmuch@notmuchmail.org\r
  57 X-Mailman-Version: 2.1.13\r
  58 Precedence: list\r
  59 List-Id: "Use and development of the notmuch mail system."\r
  60         <notmuch.notmuchmail.org>\r
  61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  64 List-Post: <mailto:notmuch@notmuchmail.org>\r
  65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  68 X-List-Received-Date: Fri, 16 Aug 2013 15:45:37 -0000\r
  69 \r
  70 On Fri, 16 Aug 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
  71 > This is v3 of id:1376587658-19202-1-git-send-email-amdragon@mit.edu.\r
  72 > This addresses Jani's comment in id:87k3jl3ehe.fsf@nikula.org by\r
  73 > treating errors while retrieving the original message's References\r
  74 > header as if the original message didn't have a References header.  It\r
  75 > also adds a comment suggested by Jani on IRC.  The diff from v2 is\r
  76 > below.\r
  77 \r
  78 The series LGTM, and I in particular welcome the diffstat in patch 3!\r
  79 \r
  80 BR,\r
  81 Jani.\r
  82 \r
  83 \r
  84 >\r
  85 > diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  86 > index bfd0f51..ac46d02 100644\r
  87 > --- a/notmuch-reply.c\r
  88 > +++ b/notmuch-reply.c\r
  89 > @@ -31,6 +31,7 @@ show_reply_headers (GMimeMessage *message)\r
  90 >      stream_stdout = g_mime_stream_file_new (stdout);\r
  91 >      if (stream_stdout) {\r
  92 >       g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
  93 > +     /* Output RFC 2822 formatted (and RFC 2047 encoded) headers. */\r
  94 >       g_mime_object_write_to_stream (GMIME_OBJECT(message), stream_stdout);\r
  95 >       g_object_unref(stream_stdout);\r
  96 >      }\r
  97 > @@ -526,14 +527,15 @@ create_reply_message(void *ctx,\r
  98 >                             "In-Reply-To", in_reply_to);\r
  99 >  \r
 100 >      orig_references = notmuch_message_get_header (message, "references");\r
 101 > -    if (orig_references) {\r
 102 > -     references = talloc_asprintf (ctx, "%s%s%s",\r
 103 > -                                   *orig_references ? orig_references : "",\r
 104 > -                                   *orig_references ? " " : "",\r
 105 > -                                   in_reply_to);\r
 106 > -     g_mime_object_set_header (GMIME_OBJECT (reply),\r
 107 > -                               "References", references);\r
 108 > -    }\r
 109 > +    if (!orig_references)\r
 110 > +     /* Treat errors like missing References headers. */\r
 111 > +     orig_references = "";\r
 112 > +    references = talloc_asprintf (ctx, "%s%s%s",\r
 113 > +                               *orig_references ? orig_references : "",\r
 114 > +                               *orig_references ? " " : "",\r
 115 > +                               in_reply_to);\r
 116 > +    g_mime_object_set_header (GMIME_OBJECT (reply),\r
 117 > +                           "References", references);\r
 118 >  \r
 119 >      return reply;\r
 120 >  }\r
 121 >\r
 122 >\r
 123 > _______________________________________________\r
 124 > notmuch mailing list\r
 125 > notmuch@notmuchmail.org\r
 126 > http://notmuchmail.org/mailman/listinfo/notmuch\r