f3/7cedffb10d21d40d05d7e44f42ae4ddbc7950f

   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 4875C6DE39A1\r
   6  for <notmuch@notmuchmail.org>; Sat, 13 Aug 2016 04:39:22 -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.573\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.573 tagged_above=-999 required=5 tests=[AWL=0.147,\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 i_mW_eNHn896 for <notmuch@notmuchmail.org>;\r
  18  Sat, 13 Aug 2016 04:39:14 -0700 (PDT)\r
  19 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com\r
  20  [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id 03A8E6DE38C5 for\r
  21  <notmuch@notmuchmail.org>; Sat, 13 Aug 2016 04:39:08 -0700 (PDT)\r
  22 Received: by mail-wm0-f67.google.com with SMTP id o80so2031959wme.0\r
  23  for <notmuch@notmuchmail.org>; Sat, 13 Aug 2016 04:39:07 -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=PxAhEegsI9qof1Z2SHmjl1i3R6UAR0ldRIYk03MQbNFG9e7EEw+80KMBZU2qPoe38j\r
  30  fQzbDUZTrR2PuaI4syb5eW6zGrrcCdcIufcvcVidtuhrljQGEppDEuqVnu8aGVIh7AzU\r
  31  9QWB7HVVKykerttfzMIrhnNGu9ubUUs1Hia+WnvbG2sPf3i64JtSjYyuzH8nKNWvQAnC\r
  32  wH6/e0gjlgLbIyEITcVv66M/3yJv5OkQojtWl5DOHm0F0EWeYFTGJNYjy/8yma+q79DN\r
  33  JKtZeYP5cMjwlVrTLmBUeRN59Dv2/Wm4vkhZA7pcVL7h3L/0xI4PavgTlvOIxmpxGXoG\r
  34  ZNOA==\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=heukTrw+vCHLjBuUvSCfQIRdy5tpTJIxkBwNgQguenAmA4Mct3j40vkTqu8ECFA8VJ\r
  41  DUFwnofqPgIDGKmOGt9TyuwK8hzR+VyKQBNXYSpmL+a46TyOcEVEkV+BeVfEfs1ol1ZQ\r
  42  OLhGtWJDc91NEHLSaIz4E/taREY8pBtNyNSDNUPC4ZrUyD2Ciay+ZA0FpzEW/cLzIoqh\r
  43  fS64UcbSNIal4M8/fa4R5UUOu+YoH8TwS894yUtzD51XE2VZ56ozRwHF2upf3h4P/bMy\r
  44  Y9vjc3p5WFkbo3bb8HbljnEAUJN7TSHxaYWnqmPMyLQ54TwrwQUzmtBmoYQ3mQEIJlWW\r
  45  L9Mw==\r
  46 X-Gm-Message-State:\r
  47  AEkooutzg4iMc8WhZsc+ozQ7Ev8G0RnyM1eiy2EgtdCVf16M0VUMbBzXaBCEo6/OoeNnKw==\r
  48 X-Received: by 10.194.7.100 with SMTP id i4mr23784534wja.154.1471088346661;\r
  49  Sat, 13 Aug 2016 04:39:06 -0700 (PDT)\r
  50 Received: from localhost (mobile-access-bcee63-250.dhcp.inet.fi.\r
  51  [188.238.99.250])\r
  52  by smtp.gmail.com with ESMTPSA id d8sm6841846wmi.0.2016.08.13.04.39.05\r
  53  (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
  54  Sat, 13 Aug 2016 04:39:06 -0700 (PDT)\r
  55 From: Jani Nikula <jani@nikula.org>\r
  56 To: notmuch@notmuchmail.org\r
  57 Cc: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,\r
  58         jani@nikula.org\r
  59 Subject: [PATCH v2 03/14] cli/reply: reuse show_reply_headers() in\r
  60  headers-only format\r
  61 Date: Sat, 13 Aug 2016 14:37:27 +0300\r
  62 Message-Id:\r
  63  <1f1bb304e0fceef19fd9822c14bafd4c86420882.1471088022.git.jani@nikula.org>\r
  64 X-Mailer: git-send-email 2.1.4\r
  65 In-Reply-To: <cover.1471088022.git.jani@nikula.org>\r
  66 References: <cover.1471088022.git.jani@nikula.org>\r
  67 In-Reply-To: <cover.1471088022.git.jani@nikula.org>\r
  68 References: <cover.1471088022.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, 13 Aug 2016 11:39:22 -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