From 04c0e685146afa62b81f59a67d7d62b35a457379 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 13 Aug 2016 14:37:27 +0300 Subject: [PATCH] [PATCH v2 03/14] cli/reply: reuse show_reply_headers() in headers-only format --- f3/7cedffb10d21d40d05d7e44f42ae4ddbc7950f | 114 ++++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 f3/7cedffb10d21d40d05d7e44f42ae4ddbc7950f diff --git a/f3/7cedffb10d21d40d05d7e44f42ae4ddbc7950f b/f3/7cedffb10d21d40d05d7e44f42ae4ddbc7950f new file mode 100644 index 000000000..49027f720 --- /dev/null +++ b/f3/7cedffb10d21d40d05d7e44f42ae4ddbc7950f @@ -0,0 +1,114 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 4875C6DE39A1 + for ; Sat, 13 Aug 2016 04:39:22 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.573 +X-Spam-Level: +X-Spam-Status: No, score=-0.573 tagged_above=-999 required=5 tests=[AWL=0.147, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, + RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id i_mW_eNHn896 for ; + Sat, 13 Aug 2016 04:39:14 -0700 (PDT) +Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com + [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id 03A8E6DE38C5 for + ; Sat, 13 Aug 2016 04:39:08 -0700 (PDT) +Received: by mail-wm0-f67.google.com with SMTP id o80so2031959wme.0 + for ; Sat, 13 Aug 2016 04:39:07 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=nikula-org.20150623.gappssmtp.com; s=20150623; + h=from:to:cc:subject:date:message-id:in-reply-to:references + :in-reply-to:references; + bh=GFqnarJmTYg+4pHdwcGqpO6WWa2zlvunnPT4GDJLQjM=; + b=PxAhEegsI9qof1Z2SHmjl1i3R6UAR0ldRIYk03MQbNFG9e7EEw+80KMBZU2qPoe38j + fQzbDUZTrR2PuaI4syb5eW6zGrrcCdcIufcvcVidtuhrljQGEppDEuqVnu8aGVIh7AzU + 9QWB7HVVKykerttfzMIrhnNGu9ubUUs1Hia+WnvbG2sPf3i64JtSjYyuzH8nKNWvQAnC + wH6/e0gjlgLbIyEITcVv66M/3yJv5OkQojtWl5DOHm0F0EWeYFTGJNYjy/8yma+q79DN + JKtZeYP5cMjwlVrTLmBUeRN59Dv2/Wm4vkhZA7pcVL7h3L/0xI4PavgTlvOIxmpxGXoG + ZNOA== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:in-reply-to:references; + bh=GFqnarJmTYg+4pHdwcGqpO6WWa2zlvunnPT4GDJLQjM=; + b=heukTrw+vCHLjBuUvSCfQIRdy5tpTJIxkBwNgQguenAmA4Mct3j40vkTqu8ECFA8VJ + DUFwnofqPgIDGKmOGt9TyuwK8hzR+VyKQBNXYSpmL+a46TyOcEVEkV+BeVfEfs1ol1ZQ + OLhGtWJDc91NEHLSaIz4E/taREY8pBtNyNSDNUPC4ZrUyD2Ciay+ZA0FpzEW/cLzIoqh + fS64UcbSNIal4M8/fa4R5UUOu+YoH8TwS894yUtzD51XE2VZ56ozRwHF2upf3h4P/bMy + Y9vjc3p5WFkbo3bb8HbljnEAUJN7TSHxaYWnqmPMyLQ54TwrwQUzmtBmoYQ3mQEIJlWW + L9Mw== +X-Gm-Message-State: + AEkooutzg4iMc8WhZsc+ozQ7Ev8G0RnyM1eiy2EgtdCVf16M0VUMbBzXaBCEo6/OoeNnKw== +X-Received: by 10.194.7.100 with SMTP id i4mr23784534wja.154.1471088346661; + Sat, 13 Aug 2016 04:39:06 -0700 (PDT) +Received: from localhost (mobile-access-bcee63-250.dhcp.inet.fi. + [188.238.99.250]) + by smtp.gmail.com with ESMTPSA id d8sm6841846wmi.0.2016.08.13.04.39.05 + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sat, 13 Aug 2016 04:39:06 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Cc: Daniel Kahn Gillmor , + jani@nikula.org +Subject: [PATCH v2 03/14] cli/reply: reuse show_reply_headers() in + headers-only format +Date: Sat, 13 Aug 2016 14:37:27 +0300 +Message-Id: + <1f1bb304e0fceef19fd9822c14bafd4c86420882.1471088022.git.jani@nikula.org> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: +References: +In-Reply-To: +References: +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 13 Aug 2016 11:39:22 -0000 + +Align the code with default format reply. There should be no changes +in output. +--- + notmuch-reply.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 847e306f94d2..5adbab624ad7 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -668,7 +668,6 @@ notmuch_reply_format_headers_only(void *ctx, + { + GMimeMessage *reply; + const char *in_reply_to, *orig_references, *references; +- char *reply_headers; + + /* The 0 means we do not want headers in a "pretty" order. */ + reply = g_mime_message_new (0); +@@ -697,9 +696,7 @@ notmuch_reply_format_headers_only(void *ctx, + + (void)add_recipients_from_message (reply, config, message, reply_all); + +- reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply)); +- printf ("%s", reply_headers); +- free (reply_headers); ++ show_reply_headers (reply); + + g_object_unref (G_OBJECT (reply)); + +-- +2.1.4 + -- 2.26.2