1 Return-Path: <dme@dme.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 olra.theworths.org (Postfix) with ESMTP id 62CE6418C38
\r
6 for <notmuch@notmuchmail.org>; Fri, 16 Apr 2010 04:48:00 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5
\r
12 tests=[BAYES_00=-1.9] autolearn=ham
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id puUH7XIrugqt for <notmuch@notmuchmail.org>;
\r
16 Fri, 16 Apr 2010 04:47:59 -0700 (PDT)
\r
17 Received: from mail-ww0-f53.google.com (mail-ww0-f53.google.com
\r
18 [74.125.82.53]) by olra.theworths.org (Postfix) with ESMTP id 78E9C418C37 for
\r
19 <notmuch@notmuchmail.org>; Fri, 16 Apr 2010 04:47:59 -0700 (PDT)
\r
20 Received: by wwb22 with SMTP id 22so1499505wwb.26
\r
21 for <notmuch@notmuchmail.org>; Fri, 16 Apr 2010 04:47:58 -0700 (PDT)
\r
22 Received: by 10.216.168.8 with SMTP id j8mr1527563wel.192.1271418478671;
\r
23 Fri, 16 Apr 2010 04:47:58 -0700 (PDT)
\r
24 Received: from ut.hh.sledj.net (gmp-ea-fw-1b.sun.com [192.18.8.1])
\r
25 by mx.google.com with ESMTPS id t27sm20395918wbc.11.2010.04.16.04.47.57
\r
26 (version=TLSv1/SSLv3 cipher=RC4-MD5);
\r
27 Fri, 16 Apr 2010 04:47:57 -0700 (PDT)
\r
28 Received: by ut.hh.sledj.net (Postfix, from userid 1000)
\r
29 id 19ECE5941DA; Fri, 16 Apr 2010 12:47:54 +0100 (BST)
\r
30 From: David Edmondson <dme@dme.org>
\r
31 To: notmuch@notmuchmail.org
\r
32 Subject: [PATCH] json: Replace `date_unix' with `timestamp' in show output
\r
33 Date: Fri, 16 Apr 2010 12:47:49 +0100
\r
34 Message-Id: <1271418469-19031-1-git-send-email-dme@dme.org>
\r
35 X-Mailer: git-send-email 1.7.0
\r
36 X-BeenThere: notmuch@notmuchmail.org
\r
37 X-Mailman-Version: 2.1.13
\r
39 List-Id: "Use and development of the notmuch mail system."
\r
40 <notmuch.notmuchmail.org>
\r
41 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
42 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
43 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
44 List-Post: <mailto:notmuch@notmuchmail.org>
\r
45 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
46 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
48 X-List-Received-Date: Fri, 16 Apr 2010 11:48:00 -0000
\r
50 Search output was already using `timestamp' for a very similar field,
\r
53 notmuch-show.c | 2 +-
\r
54 1 files changed, 1 insertions(+), 1 deletions(-)
\r
56 diff --git a/notmuch-show.c b/notmuch-show.c
\r
57 index 76873a1..26449fa 100644
\r
58 --- a/notmuch-show.c
\r
59 +++ b/notmuch-show.c
\r
60 @@ -145,7 +145,7 @@ format_message_json (const void *ctx, notmuch_message_t *message, unused (int in
\r
61 date = notmuch_message_get_date (message);
\r
62 relative_date = notmuch_time_relative_date (ctx, date);
\r
64 - printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"date_unix\": %ld, \"date_relative\": \"%s\", \"tags\": [",
\r
65 + printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [",
\r
66 json_quote_str (ctx_quote, notmuch_message_get_message_id (message)),
\r
67 notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? "true" : "false",
\r
68 json_quote_str (ctx_quote, notmuch_message_get_filename (message)),
\r