1 Return-Path: <jrollins@finestructure.net>
\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 5EEE0431FBC
\r
6 for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:12 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\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 vtRjI2Ib8EKO for <notmuch@notmuchmail.org>;
\r
16 Wed, 16 May 2012 14:56:11 -0700 (PDT)
\r
17 Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id 0E478431FBF
\r
20 for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:10 -0700 (PDT)
\r
21 Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
22 by fire-doxen-postvirus (Postfix) with ESMTP id 9DEC632805B
\r
23 for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:05 -0700 (PDT)
\r
24 X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new
\r
25 Received: from finestructure.net (rrcs-184-74-199-219.nyc.biz.rr.com
\r
26 [184.74.199.219]) (Authenticated sender: jrollins)
\r
27 by fire-doxen-submit (Postfix) with ESMTP id 9BF342E50BEE
\r
28 for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:03 -0700 (PDT)
\r
29 Received: by finestructure.net (Postfix, from userid 1000)
\r
30 id 1D8B9605; Wed, 16 May 2012 14:56:02 -0700 (PDT)
\r
31 From: Jameson Graef Rollins <jrollins@finestructure.net>
\r
32 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
33 Subject: [PATCH 4/6] cli: intialize crypto structure in show and reply
\r
34 Date: Wed, 16 May 2012 14:55:57 -0700
\r
35 Message-Id: <1337205359-2444-5-git-send-email-jrollins@finestructure.net>
\r
36 X-Mailer: git-send-email 1.7.10
\r
37 In-Reply-To: <1337205359-2444-4-git-send-email-jrollins@finestructure.net>
\r
38 References: <1337205359-2444-1-git-send-email-jrollins@finestructure.net>
\r
39 <1337205359-2444-2-git-send-email-jrollins@finestructure.net>
\r
40 <1337205359-2444-3-git-send-email-jrollins@finestructure.net>
\r
41 <1337205359-2444-4-git-send-email-jrollins@finestructure.net>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Wed, 16 May 2012 21:56:12 -0000
\r
56 This makes sure it has proper initialization values when it's created.
\r
58 notmuch-reply.c | 5 ++++-
\r
59 notmuch-show.c | 10 +++++++++-
\r
60 2 files changed, 13 insertions(+), 2 deletions(-)
\r
62 diff --git a/notmuch-reply.c b/notmuch-reply.c
\r
63 index 6662adb..3c967a0 100644
\r
64 --- a/notmuch-reply.c
\r
65 +++ b/notmuch-reply.c
\r
66 @@ -673,7 +673,10 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
\r
68 int opt_index, ret = 0;
\r
69 int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_crypto_t *crypto, notmuch_bool_t reply_all);
\r
70 - notmuch_crypto_t crypto = { .decrypt = FALSE };
\r
71 + notmuch_crypto_t crypto = {
\r
75 int format = FORMAT_DEFAULT;
\r
76 int reply_all = TRUE;
\r
78 diff --git a/notmuch-show.c b/notmuch-show.c
\r
79 index 8b4d308..c606333 100644
\r
80 --- a/notmuch-show.c
\r
81 +++ b/notmuch-show.c
\r
82 @@ -983,7 +983,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
85 const notmuch_show_format_t *format = &format_text;
\r
86 - notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE };
\r
87 + notmuch_crypto_t crypto = {
\r
91 + notmuch_show_params_t params = {
\r
93 + .omit_excluded = TRUE,
\r
96 int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;
\r
97 notmuch_bool_t verify = FALSE;
\r
98 int exclude = EXCLUDE_TRUE;
\r