8e/077baa08b1ae5a4e80b5a7e864fbdbcc9e9ba0

   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 arlo.cworth.org (Postfix) with ESMTP id B68B76DE0936\r
   6  for <notmuch@notmuchmail.org>; Sun, 19 Jun 2016 13:17:34 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at cworth.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: 0.441\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=0.441 tagged_above=-999 required=5 tests=[AWL=1.161, \r
  13  DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
  14  RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled\r
  15 Received: from arlo.cworth.org ([127.0.0.1])\r
  16  by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17  with ESMTP id ha1sZq0KO2DG for <notmuch@notmuchmail.org>;\r
  18  Sun, 19 Jun 2016 13:17:26 -0700 (PDT)\r
  19 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com\r
  20  [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id 35DAA6DE00B8 for\r
  21  <notmuch@notmuchmail.org>; Sun, 19 Jun 2016 13:17:11 -0700 (PDT)\r
  22 Received: by mail-wm0-f66.google.com with SMTP id 187so9592784wmz.1\r
  23  for <notmuch@notmuchmail.org>; Sun, 19 Jun 2016 13:17:11 -0700 (PDT)\r
  24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25  d=nikula-org.20150623.gappssmtp.com; s=20150623;\r
  26  h=from:to:cc:subject:date:message-id:in-reply-to:references\r
  27  :in-reply-to:references;\r
  28  bh=sXFKrcZlopHTqxt+2oZpuv7kSjYwfHt0jv/D1LfLMiA=;\r
  29  b=X7OiwJaJd0Os+qQ+SooA92hb2Qk2t8tMzSa+AsiZ0up75GoCSn4svfXHpP6PLizZZB\r
  30  hpyLKXI0iekrjQbsmgd57zskXWlA/o+V3OXDnC4YZxLnv5kktVsf6f5jESVxhn2X9a3V\r
  31  mCpZHmFcL+n1pxuwoQ2mz0cfyqFcjB+hs8/h1i4rKs+fLo7sKYcCDNes+ySUvNXjQBck\r
  32  QahSamIe3wn3RDxXb0UbBbv0JfMj0K/4TMWj3G6b0HiRQHfU1Aqi/MUfjahW4+VToljl\r
  33  AqfUXbV1c1AKBNx23Ol2QTeF86ZM4IWNOHqa6N44K9zbl+kB9hQMUZ1uOYZ8TMOEi1G1\r
  34  jXiQ==\r
  35 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  36  d=1e100.net; s=20130820;\r
  37  h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
  38  :references:in-reply-to:references;\r
  39  bh=sXFKrcZlopHTqxt+2oZpuv7kSjYwfHt0jv/D1LfLMiA=;\r
  40  b=H78Lt7xgDy7CbLxitQjer98W0KUrRFMOCYOnHS8Zmv7PawpgBkro4EN7/gurbB1yne\r
  41  TC9egsXrIjEf6mPmn3tyi5Kn8KyxIlqKndfzi2NDxRThYs22z7tLbJGBujqitSIVb91b\r
  42  7Mxiv28TT4naDEc7cLGUvXLpJOvdt8zhPUFhsQLYPnBcokfhGlVyTMhsrlRWfT0NlfdM\r
  43  rZE9sJj0MkU9z2qG0WynlPdSPFvj7hWe6FbNmOOC1CWo5GA/ntrGBGB8z5pCl0oCUw4o\r
  44  NtXQGR5hHB3YRBEOAIDheE0vL8ysSQgwooBu0qEE7Dbm/Y4Tu4rtgePiy/KRmMKRVMEh\r
  45  GsvA==\r
  46 X-Gm-Message-State:\r
  47  ALyK8tIHsNND7WywtHZLh/rLcxZTKYcntAFDK8TWlQ0e6oCy5cMP+/HTNagKu20MgIF2oQ==\r
  48 X-Received: by 10.194.23.226 with SMTP id p2mr11192110wjf.120.1466367429812;\r
  49  Sun, 19 Jun 2016 13:17:09 -0700 (PDT)\r
  50 Received: from localhost (dsl-hkibrasgw2-58c37a-44.dhcp.inet.fi.\r
  51  [88.195.122.44])\r
  52  by smtp.gmail.com with ESMTPSA id b187sm8321811wmg.15.2016.06.19.13.17.09\r
  53  (version=TLSv1/SSLv3 cipher=OTHER);\r
  54  Sun, 19 Jun 2016 13:17:09 -0700 (PDT)\r
  55 From: Jani Nikula <jani@nikula.org>\r
  56 To: Jani Nikula <jani@nikula.org>,\r
  57         notmuch@notmuchmail.org\r
  58 Cc: Daniel Kahn Gillmor <dkg@fifthhorseman.net>\r
  59 Subject: [RFC PATCH 6/6] cli/reply: only pass gmime message to add recipients\r
  60  to reply message\r
  61 Date: Sun, 19 Jun 2016 23:15:34 +0300\r
  62 Message-Id:\r
  63  <e1b85e99640cdb5d57c30400f3b87a404422ba14.1466366738.git.jani@nikula.org>\r
  64 X-Mailer: git-send-email 2.1.4\r
  65 In-Reply-To: <cover.1466366737.git.jani@nikula.org>\r
  66 References: <cover.1466284726.git.jani@nikula.org>\r
  67  <cover.1466366737.git.jani@nikula.org>\r
  68 In-Reply-To: <cover.1466366737.git.jani@nikula.org>\r
  69 References: <cover.1466366737.git.jani@nikula.org>\r
  70 X-BeenThere: notmuch@notmuchmail.org\r
  71 X-Mailman-Version: 2.1.20\r
  72 Precedence: list\r
  73 List-Id: "Use and development of the notmuch mail system."\r
  74  <notmuch.notmuchmail.org>\r
  75 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
  76  <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  77 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
  78 List-Post: <mailto:notmuch@notmuchmail.org>\r
  79 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  80 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
  81  <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  82 X-List-Received-Date: Sun, 19 Jun 2016 20:17:34 -0000\r
  83 \r
  84 The notmuch message is no longer needed. Simplify.\r
  85 ---\r
  86  notmuch-reply.c | 37 ++++++++++++++-----------------------\r
  87  1 file changed, 14 insertions(+), 23 deletions(-)\r
  88 \r
  89 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  90 index abf3a6c1824c..8c894974485d 100644\r
  91 --- a/notmuch-reply.c\r
  92 +++ b/notmuch-reply.c\r
  93 @@ -272,12 +272,11 @@ reply_to_header_is_redundant (GMimeMessage *message,\r
  94      return ret;\r
  95  }\r
  96  \r
  97 -static InternetAddressList *get_sender(notmuch_message_t *message,\r
  98 -                                      GMimeMessage *mime_message)\r
  99 +static InternetAddressList *get_sender(GMimeMessage *message)\r
 100  {\r
 101      const char *reply_to;\r
 102  \r
 103 -    reply_to = g_mime_message_get_reply_to (mime_message);\r
 104 +    reply_to = g_mime_message_get_reply_to (message);\r
 105      if (reply_to && *reply_to) {\r
 106         InternetAddressList *reply_to_list;\r
 107  \r
 108 @@ -295,35 +294,29 @@ static InternetAddressList *get_sender(notmuch_message_t *message,\r
 109          * will always appear in the reply if reply_all is true.\r
 110          */\r
 111         reply_to_list = internet_address_list_parse_string (reply_to);\r
 112 -       if (! reply_to_header_is_redundant (mime_message, reply_to_list))\r
 113 +       if (! reply_to_header_is_redundant (message, reply_to_list))\r
 114             return reply_to_list;\r
 115  \r
 116         g_object_unref (G_OBJECT (reply_to_list));\r
 117      }\r
 118  \r
 119      return internet_address_list_parse_string (\r
 120 -       g_mime_message_get_sender (mime_message));\r
 121 +       g_mime_message_get_sender (message));\r
 122  }\r
 123  \r
 124 -static InternetAddressList *get_to(unused(notmuch_message_t *message),\r
 125 -                                  GMimeMessage *mime_message)\r
 126 +static InternetAddressList *get_to(GMimeMessage *message)\r
 127  {\r
 128 -    return g_mime_message_get_recipients (mime_message,\r
 129 -                                         GMIME_RECIPIENT_TYPE_TO);\r
 130 +    return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);\r
 131  }\r
 132  \r
 133 -static InternetAddressList *get_cc(unused(notmuch_message_t *message),\r
 134 -                                  GMimeMessage *mime_message)\r
 135 +static InternetAddressList *get_cc(GMimeMessage *message)\r
 136  {\r
 137 -    return g_mime_message_get_recipients (mime_message,\r
 138 -                                         GMIME_RECIPIENT_TYPE_CC);\r
 139 +    return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);\r
 140  }\r
 141  \r
 142 -static InternetAddressList *get_bcc(unused(notmuch_message_t *message),\r
 143 -                                   GMimeMessage *mime_message)\r
 144 +static InternetAddressList *get_bcc(GMimeMessage *message)\r
 145  {\r
 146 -    return g_mime_message_get_recipients (mime_message,\r
 147 -                                         GMIME_RECIPIENT_TYPE_BCC);\r
 148 +    return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_BCC);\r
 149  }\r
 150  \r
 151  /* Augment the recipients of 'reply' from the "Reply-to:", "From:",\r
 152 @@ -341,13 +334,11 @@ static InternetAddressList *get_bcc(unused(notmuch_message_t *message),\r
 153  static const char *\r
 154  add_recipients_from_message (GMimeMessage *reply,\r
 155                              notmuch_config_t *config,\r
 156 -                            notmuch_message_t *message,\r
 157 -                            GMimeMessage *mime_message,\r
 158 +                            GMimeMessage *message,\r
 159                              notmuch_bool_t reply_all)\r
 160  {\r
 161      struct {\r
 162 -       InternetAddressList * (*get_header)(notmuch_message_t *message,\r
 163 -                                           GMimeMessage *mime_message);\r
 164 +       InternetAddressList * (*get_header)(GMimeMessage *message);\r
 165         GMimeRecipientType recipient_type;\r
 166      } reply_to_map[] = {\r
 167         { get_sender,   GMIME_RECIPIENT_TYPE_TO },\r
 168 @@ -362,7 +353,7 @@ add_recipients_from_message (GMimeMessage *reply,\r
 169      for (i = 0; i < ARRAY_SIZE (reply_to_map); i++) {\r
 170         InternetAddressList *recipients;\r
 171  \r
 172 -       recipients = reply_to_map[i].get_header (message, mime_message);\r
 173 +       recipients = reply_to_map[i].get_header (message);\r
 174  \r
 175         n += scan_address_list (recipients, config, reply,\r
 176                                 reply_to_map[i].recipient_type, &from_addr);\r
 177 @@ -567,7 +558,7 @@ create_reply_message(void *ctx,\r
 178  \r
 179      g_mime_object_set_header (GMIME_OBJECT (reply), "References", references);\r
 180  \r
 181 -    from_addr = add_recipients_from_message (reply, config, message,\r
 182 +    from_addr = add_recipients_from_message (reply, config,\r
 183                                              mime_message, reply_all);\r
 184  \r
 185      /* The above is all that is needed for limited headers. */\r
 186 -- \r
 187 2.1.4\r
 188 \r