--- /dev/null
+Return-Path: <mpn@google.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id B596C431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 9 Sep 2012 23:35:40 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.8\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.8 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id lx7z1iyg14KB for <notmuch@notmuchmail.org>;\r
+ Sun, 9 Sep 2012 23:35:39 -0700 (PDT)\r
+Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com\r
+ [74.125.83.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ A8BF9431FAE for <notmuch@notmuchmail.org>; Sun, 9 Sep 2012 23:35:38 -0700\r
+ (PDT)\r
+Received: by eekb47 with SMTP id b47so1003639eek.26\r
+ for <notmuch@notmuchmail.org>; Sun, 09 Sep 2012 23:35:37 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\r
+ s=20120113;\r
+ h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;\r
+ bh=9PofzNbNy5b0CBsioczxEEX6Gx1skFRtjds85cZZDYU=;\r
+ b=cecl5VKn41Fo5EA1LGX0RzXCBCo79Kt0eqC/nQF213ybfphzq9NyWDitmD8190Tps0\r
+ e4PXUcId4dE1x1sglmi1E1DwjcUkIy3Is3Ix4UylopMrETbCOmYro64D0LBidACS1nKu\r
+ AH1yjK3iqBszVtTv/oOqRrr/oDH6Ofb4Z8GtAzmYDZDn9IpJvHvh4LbaYg17uXA33Vum\r
+ X9ym7tIZiAkNsy8ZxYcfMn0Dps4wZPavPEjq8yI2Lj3J56bB3fw3cklf0TTg79SBiorm\r
+ bKxv3Rt6sjHMDPJICoSu+rNfjJY53jhoQretmDlVvQgIbxNnUrDh3iQVYPUj6MRBsVMo Mc1g==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=from:to:subject:date:message-id:x-mailer:in-reply-to:references\r
+ :x-gm-message-state;\r
+ bh=9PofzNbNy5b0CBsioczxEEX6Gx1skFRtjds85cZZDYU=;\r
+ b=DtPXVKpyf4/X8M5hYLk4Fn08TA7x5pH/F70T1IkUFabqAe55B0E9NXzfcNFuT4HKNe\r
+ a4hYvAU/3Ha41XdVGLLRIU1h388Tn+9rdk3KuXCYqT0ZcULOdMnyaQJkERB0XeOlcuIb\r
+ ranVAYvwh33I5DjbU1PqBX2J1j7MpqWEb7V6QE9IADsfhoSVgIcK8eRd2UOt0rz8xsOJ\r
+ UXpK0j35DKj649DjVgE9mYXS5my++wLCJOTXpdw8c0Mz4Rz1lRTqb18PAGw92H5ugUsa\r
+ +Cyr4KhPDe4TWCij8Ux7zLx6BvADBH3UPwUGA9DdWAXiLxO8rauafx2puxbPPojzPY8m\r
+ WmOg==\r
+Received: by 10.204.128.196 with SMTP id l4mr3521453bks.21.1347258937160;\r
+ Sun, 09 Sep 2012 23:35:37 -0700 (PDT)\r
+Received: by 10.204.128.196 with SMTP id l4mr3521450bks.21.1347258936935;\r
+ Sun, 09 Sep 2012 23:35:36 -0700 (PDT)\r
+Received: from mpn-glaptop.corp.google.com\r
+ (dhcp-172-16-75-166.zrh.corp.google.com [172.16.75.166])\r
+ by mx.google.com with ESMTPS id hs2sm5957891bkc.1.2012.09.09.23.35.35\r
+ (version=SSLv3 cipher=OTHER); Sun, 09 Sep 2012 23:35:35 -0700 (PDT)\r
+From: Michal Nazarewicz <mpn@google.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCHv3] notmuch-show: include Bcc header in json output\r
+Date: Mon, 10 Sep 2012 08:35:30 +0200\r
+Message-Id:\r
+ <7b1848a5828820912e3f7b960528b0dbc6a8b361.1347258748.git.mina86@mina86.com>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <m2zk50oiq6.fsf@guru.guru-group.fi>\r
+References: <m2zk50oiq6.fsf@guru.guru-group.fi>\r
+X-Gm-Message-State: ALoCoQkFamdTaufbbbuM6ipMfNXAkJki7tCEcT0F89BbrlcHczkaFVfAZVC3XbLR9oGyo85c50N/klmRSCHM+3LKkLZwlJEFZtS8/84/NH3NMIqN0z6IzkNRnaTuLIj8Lu7RYL71d11FYsmK4sSofdAn6pp52w+5HmdyttyoapYtX+vgXBUYsD5Z7Q/qqpAX+HITP8nMJjj1aW0eADGxfm85/uApaaCk0g==\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 10 Sep 2012 06:35:41 -0000\r
+\r
+From: Michal Nazarewicz <mina86@mina86.com>\r
+\r
+With this change, emacs users can use notmuch-message-headers\r
+variable to configure notmuch-show display Bcc header.\r
+---\r
+ notmuch-show.c | 7 +++++++\r
+ test/json | 8 ++++----\r
+ test/test-lib.sh | 5 +++++\r
+ 3 files changed, 16 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 3556293..0b7abf1 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -233,6 +233,13 @@ format_headers_json (sprinter_t *sp, GMimeMessage *message,\r
+ sp->string (sp, recipients_string);\r
+ }\r
+ \r
++ recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_BCC);\r
++ recipients_string = internet_address_list_to_string (recipients, 0);\r
++ if (recipients_string) {\r
++ sp->map_key (sp, "Bcc");\r
++ sp->string (sp, recipients_string);\r
++ }\r
++\r
+ if (reply) {\r
+ sp->map_key (sp, "In-reply-to");\r
+ sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "In-reply-to"));\r
+diff --git a/test/json b/test/json\r
+index ac8fa8e..40d0ba3 100755\r
+--- a/test/json\r
++++ b/test/json\r
+@@ -3,18 +3,18 @@ test_description="--format=json output"\r
+ . ./test-lib.sh\r
+ \r
+ test_begin_subtest "Show message: json"\r
+-add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-show-message\""\r
++add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[bcc]=\"test_suite+bcc@notmuchmail.org\"" "[body]=\"json-show-message\""\r
+ output=$(notmuch show --format=json "json-show-message")\r
+-test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
++test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Bcc\": \"test_suite+bcc@notmuchmail.org\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+ \r
+ # This should be the same output as above.\r
+ test_begin_subtest "Show message: json --body=true"\r
+ output=$(notmuch show --format=json --body=true "json-show-message")\r
+-test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
++test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Bcc\": \"test_suite+bcc@notmuchmail.org\",\"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+ \r
+ test_begin_subtest "Show message: json --body=false"\r
+ output=$(notmuch show --format=json --body=false "json-show-message")\r
+-test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}}, []]]]"\r
++test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Bcc\": \"test_suite+bcc@notmuchmail.org\",\"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}}, []]]]"\r
+ \r
+ test_begin_subtest "Search message: json"\r
+ add_message "[subject]=\"json-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-search-message\""\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index f34b1fb..e14203d 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -350,6 +350,11 @@ ${additional_headers}"\r
+ ${additional_headers}"\r
+ fi\r
+ \r
++ if [ ! -z "${template[bcc]}" ]; then\r
++ additional_headers="Bcc: ${template[bcc]}\r
++${additional_headers}"\r
++ fi\r
++\r
+ if [ ! -z "${template[references]}" ]; then\r
+ additional_headers="References: ${template[references]}\r
+ ${additional_headers}"\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff