From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 4BEB26DE0EF2 for ; Sat, 9 Nov 2019 14:14:06 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.396 X-Spam-Level: X-Spam-Status: No, score=-0.396 tagged_above=-999 required=5 tests=[AWL=-0.195, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001] 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 8bvStSTwXsi7 for ; Sat, 9 Nov 2019 14:14:05 -0800 (PST) Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by arlo.cworth.org (Postfix) with ESMTPS id 284F86DE0EED for ; Sat, 9 Nov 2019 14:14:05 -0800 (PST) Received: by mail-lf1-f48.google.com with SMTP id j14so7072191lfb.8 for ; Sat, 09 Nov 2019 14:14:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NxoT8Cp1vUDXJZK50pIzRzJfydwjsGz+LZYNefB7uUk=; b=f2BGnkeph1ExxxFKz7HUPUJL+QkhbRQy1nYMM5Mjmh0sEwcubfMs0Sz4tW/4fqeiNC tyQQF3AZ5U/oDnSoYhm8RZCLWhlffQIlOuFHikG+XcrppxN8QeqpKXKLmM7jSO6+EDa2 1rqM6aRumXRejLpz2zJjwTr+56++bvUAdNfdv/eTq3eTOT/aoZlUpPRmNyII/mMkIbUn G4ZRzkIIHIsARCGfDc5DyqKn+QmGfamkBeapJVOIhLzrwR8PrTssIT+JQGm/Jxa2EbCB 3SZw/GwZ/1zC6Ge5zusAURJWQzdp32zpo/A60lKQDUBMIrvNRnl13PBCS+0PPjkXL3/x oyig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NxoT8Cp1vUDXJZK50pIzRzJfydwjsGz+LZYNefB7uUk=; b=dJlACGQh8M7NvGtgudCVPnYHVIZfrcIxxNkfhRXDTloCR7O/OopuIvVBBfttw/CgmT cTNBdHzvKeq+WTv9LGKOXGcKlv4nMeEp4Dqa+fPMJ40Qj5qmiUohDZyY1hn7b/sCWrA6 oy5HIEvy2hiQgrEi73d1JbLvbcg901s/IOBr+jUTJIKzKMmZhp54N4pwyvaM2tX6ZaCn o+TP9z3IRu6cpSnxSkfS17OAMKPc9oPLi1q0VlnPdV6v10qgXKv1dypMWcMMKGyLjA0I KvIvOG50hij+7CLwBMvMnmjIhwNotOlf1NWvKcnAfo3BmYATOvQ0HUJzyCZyH5W33nmQ fEqw== X-Gm-Message-State: APjAAAXGqjzwVJEN8PVqbAIq1C81M/7DGudHVeV12VFMZVXENhSqvD4k jSQB84G/ytRy+ZiJTPg0iS6pgELJUBg= X-Google-Smtp-Source: APXvYqz6xtwolcqRjSnVghDW3L0XU0WKXMK3R0Aoa9hm3HLN4yMCDhHRpJy8hjgOfIzLeD3irc8mWw== X-Received: by 2002:a19:c514:: with SMTP id w20mr11142758lfe.143.1573337642695; Sat, 09 Nov 2019 14:14:02 -0800 (PST) Received: from localhost.localdomain (h88-129-82-160.cust.a3fiber.se. [88.129.82.160]) by smtp.gmail.com with ESMTPSA id 3sm4670791lfq.55.2019.11.09.14.14.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Nov 2019 14:14:02 -0800 (PST) From: Johan Parin X-Google-Original-From: Johan Parin To: notmuch@notmuchmail.org Cc: Johan Parin Subject: [PATCH] Fix format_headers_sprinter to return all headers (v2) Date: Sat, 9 Nov 2019 23:13:58 +0100 Message-Id: <20191109221358.4349-1-johan.parin@gmail.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 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, 09 Nov 2019 22:14:06 -0000 Modify format_headers_sprinter so that it returns some additional headers in the sexp, instead of a small fixed set of headers. This version includes the following headers: - Maildir - Mailing-list - Tags - Attachments - Signature - Decryption - User-agent - X-Mailer This is required in order for the elisp variable `notmuch-message-headers' to work to some extent. See this bug report: https://notmuchmail.org/pipermail/notmuch/2017/026069.html --- notmuch-show.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/notmuch-show.c b/notmuch-show.c index 21792a57..86ddb491 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -205,6 +205,12 @@ format_headers_sprinter (sprinter_t *sp, GMimeMessage *message, char *recipients_string; const char *reply_to_string; void *local = talloc_new (sp); + GMimeHeaderList *header_list; + GMimeHeader *header; + const char* interesting_headers[] = { + "Maildir", "Mailing-list", "Tags", "Attachments", "Signature", + "Decryption", "User-agent", "X-Mailer"}; + const int interesting_header_count = sizeof(interesting_headers) / sizeof(char *); sp->begin_map (sp); @@ -255,6 +261,19 @@ format_headers_sprinter (sprinter_t *sp, GMimeMessage *message, sp->string (sp, g_mime_message_get_date_string (sp, message)); } + header_list = g_mime_object_get_header_list (GMIME_OBJECT(message)); + + for (int i = 0; i < interesting_header_count; i++) { + + header = g_mime_header_list_get_header( + header_list, interesting_headers[i]); + if (header == NULL) + continue; + + sp->map_key (sp, g_mime_header_get_name(header)); + sp->string (sp, g_mime_header_get_value(header)); + } + sp->end (sp); talloc_free (local); } -- 2.21.0 (Apple Git-122)