1 Return-Path: <markwalters1009@gmail.com>
\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 7D328429E36
\r
6 for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:40 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id XGL4co1JSzsg for <notmuch@notmuchmail.org>;
\r
18 Wed, 29 Feb 2012 10:11:39 -0800 (PST)
\r
19 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com
\r
20 [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id C309A429E38
\r
23 for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:35 -0800 (PST)
\r
24 Received: by wibhi8 with SMTP id hi8so5092473wib.26
\r
25 for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:34 -0800 (PST)
\r
26 Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates
\r
27 10.180.24.4 as permitted sender) client-ip=10.180.24.4;
\r
28 Authentication-Results: mr.google.com; spf=pass (google.com: domain of
\r
29 markwalters1009@gmail.com designates 10.180.24.4 as permitted
\r
30 sender) smtp.mail=markwalters1009@gmail.com;
\r
31 dkim=pass header.i=markwalters1009@gmail.com
\r
32 Received: from mr.google.com ([10.180.24.4])
\r
33 by 10.180.24.4 with SMTP id q4mr19745280wif.7.1330539094628 (num_hops =
\r
34 1); Wed, 29 Feb 2012 10:11:34 -0800 (PST)
\r
35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
36 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
37 bh=cs8MWJJZy1T551FVMtQqMyYELOjVW6zOCYEVCAVNI24=;
\r
38 b=knf9pbTHYzJW5XiV6dAP+9HQdjBFNMM9SiFQVVUtNok2Us8dSVx2CryGurJVBpxunt
\r
39 3MfQmYM9QdowYXEJ04KpKOLgW+n1Sb0cSZatVtoN1xpilXMpZpAJMqwpLH7I76wvU4sx
\r
40 Gw1qzUf2URRKLsxRDwyoLQ0h37r6NWQKtS+sA=
\r
41 Received: by 10.180.24.4 with SMTP id q4mr15747463wif.7.1330539094585;
\r
42 Wed, 29 Feb 2012 10:11:34 -0800 (PST)
\r
43 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.
\r
44 [94.192.233.223]) by mx.google.com with ESMTPS id
\r
45 s4sm83121717wiy.5.2012.02.29.10.11.33 (version=TLSv1/SSLv3 cipher=OTHER);
\r
46 Wed, 29 Feb 2012 10:11:33 -0800 (PST)
\r
47 From: Mark Walters <markwalters1009@gmail.com>
\r
48 To: notmuch@notmuchmail.org
\r
49 Subject: [PATCH 1/5] config: disable addition of exclude tags for 0.12
\r
50 Date: Wed, 29 Feb 2012 18:13:05 +0000
\r
51 Message-Id: <1330539189-16593-2-git-send-email-markwalters1009@gmail.com>
\r
52 X-Mailer: git-send-email 1.7.2.3
\r
53 In-Reply-To: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com>
\r
54 References: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com>
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Wed, 29 Feb 2012 18:11:41 -0000
\r
69 This disables the addition of search_exclude_tags in notmuch-setup and
\r
72 notmuch-config.c | 3 +--
\r
73 notmuch-setup.c | 19 +------------------
\r
74 2 files changed, 2 insertions(+), 20 deletions(-)
\r
76 diff --git a/notmuch-config.c b/notmuch-config.c
\r
77 index e9b2750..61fda3e 100644
\r
78 --- a/notmuch-config.c
\r
79 +++ b/notmuch-config.c
\r
80 @@ -377,8 +377,7 @@ notmuch_config_open (void *ctx,
\r
82 if (notmuch_config_get_search_exclude_tags (config, &tmp) == NULL) {
\r
84 - const char *tags[] = { "deleted", "spam" };
\r
85 - notmuch_config_set_search_exclude_tags (config, tags, 2);
\r
86 + /* We do not set default search_exclude_tags for 0.12 */
\r
88 notmuch_config_set_search_exclude_tags (config, NULL, 0);
\r
90 diff --git a/notmuch-setup.c b/notmuch-setup.c
\r
91 index 94d0aa7..307231d 100644
\r
92 --- a/notmuch-setup.c
\r
93 +++ b/notmuch-setup.c
\r
94 @@ -133,8 +133,6 @@ notmuch_setup_command (unused (void *ctx),
\r
96 const char **new_tags;
\r
97 size_t new_tags_len;
\r
98 - const char **search_exclude_tags;
\r
99 - size_t search_exclude_tags_len;
\r
101 #define prompt(format, ...) \
\r
103 @@ -211,22 +209,7 @@ notmuch_setup_command (unused (void *ctx),
\r
107 - search_exclude_tags = notmuch_config_get_search_exclude_tags (config, &search_exclude_tags_len);
\r
109 - printf ("Tags to exclude when searching messages (separated by spaces) [");
\r
110 - print_tag_list (search_exclude_tags, search_exclude_tags_len);
\r
113 - if (strlen (response)) {
\r
114 - GPtrArray *tags = parse_tag_list (ctx, response);
\r
116 - notmuch_config_set_search_exclude_tags (config,
\r
117 - (const char **) tags->pdata,
\r
120 - g_ptr_array_free (tags, TRUE);
\r
123 + /* Temporarily remove exclude tag support for 0.12 */
\r
125 if (! notmuch_config_save (config)) {
\r