a0/604734cb524bcdc190e28b2799a6442e0fa332

   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 412706DE0363\r
   6  for <notmuch@notmuchmail.org>; Sat, 18 Jun 2016 14:33:17 -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.563\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.563 tagged_above=-999 required=5 tests=[AWL=0.157,\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 suJ-fmqOwxVx for <notmuch@notmuchmail.org>;\r
  18  Sat, 18 Jun 2016 14:33:09 -0700 (PDT)\r
  19 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com\r
  20  [74.125.82.65]) by arlo.cworth.org (Postfix) with ESMTPS id 5D7386DE01F7 for\r
  21  <notmuch@notmuchmail.org>; Sat, 18 Jun 2016 14:33:02 -0700 (PDT)\r
  22 Received: by mail-wm0-f65.google.com with SMTP id r201so5509900wme.0\r
  23  for <notmuch@notmuchmail.org>; Sat, 18 Jun 2016 14:33:02 -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=GFqnarJmTYg+4pHdwcGqpO6WWa2zlvunnPT4GDJLQjM=;\r
  29  b=MmQ+ODUFwpDhBJTuV1CkfdOO9/0l5uR2evQohf3ViMrn3MWKWwIXavJve+N/7Fw8Xy\r
  30  tX+EMGiBO6lu4uKWp7IG7eOQZ90J7PgQ8yqpsB6Q3TDp4kuT8NbFSc3LDUNHZxUQpBvo\r
  31  LAKyZTYGa4qXcrKihRVpx1U5XZVlaf2v+S6fSUwNfk6bvqBV3NASTF1iBNmg3jnmUbwH\r
  32  APP1uoYqQ8+pKLshdhImUK5cDCAUcaCZGfTGK1fbMLpRT65e4AS5ctPUuqym0sQIpDIu\r
  33  GDAwD0l5rXoOu3ZFwuJ4PxOPYG/c4HC6RgQhA0fnczINKzsmYgHOy1pkdo5zqEIU+q/+\r
  34  wsPQ==\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=GFqnarJmTYg+4pHdwcGqpO6WWa2zlvunnPT4GDJLQjM=;\r
  40  b=YDPQWGdt6dFSdLJGzsOwYvBGwEj7RT/eFyc3YRZ4FPWca6qjOlz74/LJcdPxfSTsQS\r
  41  XWbbjxmwmg9Z8N3Ujf/kscraKVH/ldscGyacDQ3Ovu4ztyP37Ok3O2EdViShrtljwk+Z\r
  42  tFB6zvFmk1Bp+GTE9bGDzRf/QxgL232sVGQmgkWbSCJeO6717e1cErSux8thlP1WGRiF\r
  43  0LR9GZXRJLhCjOzZiFhoROaNAY9DbUE/YnxmVr8GJjvTwASAGr48ZLkTIHFx9WQlmx6C\r
  44  QeKDY3UdraLtpZSk+Nz+7Hv6Z4hrNYoO5YMO+Vip+0DlM2XLPZbSaCbaTkvKF9pcUwUh\r
  45  6loQ==\r
  46 X-Gm-Message-State:\r
  47  ALyK8tLT3fCpv1SmDmtn/QavOPr3NAhVkTjRzkw2GIRk+oVj/Sqrhs/O5QLh4iMM02vkYA==\r
  48 X-Received: by 10.28.126.2 with SMTP id z2mr4456655wmc.73.1466285580934;\r
  49  Sat, 18 Jun 2016 14:33:00 -0700 (PDT)\r
  50 Received: from localhost (mobile-access-bcee4e-81.dhcp.inet.fi.\r
  51  [188.238.78.81])\r
  52  by smtp.gmail.com with ESMTPSA id t190sm315649wmt.24.2016.06.18.14.33.00\r
  53  (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
  54  Sat, 18 Jun 2016 14:33:00 -0700 (PDT)\r
  55 From: Jani Nikula <jani@nikula.org>\r
  56 To: notmuch@notmuchmail.org\r
  57 Cc: jani@nikula.org,\r
  58         Daniel Kahn Gillmor <dkg@fifthhorseman.net>\r
  59 Subject: [PATCH 2/7] cli/reply: reuse show_reply_headers() in headers-only\r
  60  format\r
  61 Date: Sun, 19 Jun 2016 00:31:28 +0300\r
  62 Message-Id:\r
  63  <bff3ad5926a90b776542dee9a8a4f4f187def901.1466284726.git.jani@nikula.org>\r
  64 X-Mailer: git-send-email 2.1.4\r
  65 In-Reply-To: <cover.1466284726.git.jani@nikula.org>\r
  66 References: <cover.1466284726.git.jani@nikula.org>\r
  67 In-Reply-To: <cover.1466284726.git.jani@nikula.org>\r
  68 References: <cover.1466284726.git.jani@nikula.org>\r
  69 X-BeenThere: notmuch@notmuchmail.org\r
  70 X-Mailman-Version: 2.1.20\r
  71 Precedence: list\r
  72 List-Id: "Use and development of the notmuch mail system."\r
  73  <notmuch.notmuchmail.org>\r
  74 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
  75  <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  76 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
  77 List-Post: <mailto:notmuch@notmuchmail.org>\r
  78 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  79 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
  80  <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  81 X-List-Received-Date: Sat, 18 Jun 2016 21:33:17 -0000\r
  82 \r
  83 Align the code with default format reply. There should be no changes\r
  84 in output.\r
  85 ---\r
  86  notmuch-reply.c | 5 +----\r
  87  1 file changed, 1 insertion(+), 4 deletions(-)\r
  88 \r
  89 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  90 index 847e306f94d2..5adbab624ad7 100644\r
  91 --- a/notmuch-reply.c\r
  92 +++ b/notmuch-reply.c\r
  93 @@ -668,7 +668,6 @@ notmuch_reply_format_headers_only(void *ctx,\r
  94  {\r
  95      GMimeMessage *reply;\r
  96      const char *in_reply_to, *orig_references, *references;\r
  97 -    char *reply_headers;\r
  98  \r
  99      /* The 0 means we do not want headers in a "pretty" order. */\r
 100      reply = g_mime_message_new (0);\r
 101 @@ -697,9 +696,7 @@ notmuch_reply_format_headers_only(void *ctx,\r
 102  \r
 103      (void)add_recipients_from_message (reply, config, message, reply_all);\r
 104  \r
 105 -    reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply));\r
 106 -    printf ("%s", reply_headers);\r
 107 -    free (reply_headers);\r
 108 +    show_reply_headers (reply);\r
 109  \r
 110      g_object_unref (G_OBJECT (reply));\r
 111  \r
 112 -- \r
 113 2.1.4\r
 114 \r