From: Mark Walters Date: Wed, 29 Feb 2012 18:13:05 +0000 (+0000) Subject: [PATCH 1/5] config: disable addition of exclude tags for 0.12 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5b6eb447f9c862cea5e52e18cfa413089d4fc402;p=notmuch-archives.git [PATCH 1/5] config: disable addition of exclude tags for 0.12 --- diff --git a/1c/0b5433469a06e2a484345fbfdf32c381728927 b/1c/0b5433469a06e2a484345fbfdf32c381728927 new file mode 100644 index 000000000..5df155bef --- /dev/null +++ b/1c/0b5433469a06e2a484345fbfdf32c381728927 @@ -0,0 +1,129 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 7D328429E36 + for ; Wed, 29 Feb 2012 10:11:40 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id XGL4co1JSzsg for ; + Wed, 29 Feb 2012 10:11:39 -0800 (PST) +Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com + [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C309A429E38 + for ; Wed, 29 Feb 2012 10:11:35 -0800 (PST) +Received: by wibhi8 with SMTP id hi8so5092473wib.26 + for ; Wed, 29 Feb 2012 10:11:34 -0800 (PST) +Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates + 10.180.24.4 as permitted sender) client-ip=10.180.24.4; +Authentication-Results: mr.google.com; spf=pass (google.com: domain of + markwalters1009@gmail.com designates 10.180.24.4 as permitted + sender) smtp.mail=markwalters1009@gmail.com; + dkim=pass header.i=markwalters1009@gmail.com +Received: from mr.google.com ([10.180.24.4]) + by 10.180.24.4 with SMTP id q4mr19745280wif.7.1330539094628 (num_hops = + 1); Wed, 29 Feb 2012 10:11:34 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=cs8MWJJZy1T551FVMtQqMyYELOjVW6zOCYEVCAVNI24=; + b=knf9pbTHYzJW5XiV6dAP+9HQdjBFNMM9SiFQVVUtNok2Us8dSVx2CryGurJVBpxunt + 3MfQmYM9QdowYXEJ04KpKOLgW+n1Sb0cSZatVtoN1xpilXMpZpAJMqwpLH7I76wvU4sx + Gw1qzUf2URRKLsxRDwyoLQ0h37r6NWQKtS+sA= +Received: by 10.180.24.4 with SMTP id q4mr15747463wif.7.1330539094585; + Wed, 29 Feb 2012 10:11:34 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + s4sm83121717wiy.5.2012.02.29.10.11.33 (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 29 Feb 2012 10:11:33 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 1/5] config: disable addition of exclude tags for 0.12 +Date: Wed, 29 Feb 2012 18:13:05 +0000 +Message-Id: <1330539189-16593-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com> +References: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Wed, 29 Feb 2012 18:11:41 -0000 + +This disables the addition of search_exclude_tags in notmuch-setup and +notmuch-config. +--- + notmuch-config.c | 3 +-- + notmuch-setup.c | 19 +------------------ + 2 files changed, 2 insertions(+), 20 deletions(-) + +diff --git a/notmuch-config.c b/notmuch-config.c +index e9b2750..61fda3e 100644 +--- a/notmuch-config.c ++++ b/notmuch-config.c +@@ -377,8 +377,7 @@ notmuch_config_open (void *ctx, + + if (notmuch_config_get_search_exclude_tags (config, &tmp) == NULL) { + if (is_new) { +- const char *tags[] = { "deleted", "spam" }; +- notmuch_config_set_search_exclude_tags (config, tags, 2); ++ /* We do not set default search_exclude_tags for 0.12 */ + } else { + notmuch_config_set_search_exclude_tags (config, NULL, 0); + } +diff --git a/notmuch-setup.c b/notmuch-setup.c +index 94d0aa7..307231d 100644 +--- a/notmuch-setup.c ++++ b/notmuch-setup.c +@@ -133,8 +133,6 @@ notmuch_setup_command (unused (void *ctx), + int is_new; + const char **new_tags; + size_t new_tags_len; +- const char **search_exclude_tags; +- size_t search_exclude_tags_len; + + #define prompt(format, ...) \ + do { \ +@@ -211,22 +209,7 @@ notmuch_setup_command (unused (void *ctx), + } + + +- search_exclude_tags = notmuch_config_get_search_exclude_tags (config, &search_exclude_tags_len); +- +- printf ("Tags to exclude when searching messages (separated by spaces) ["); +- print_tag_list (search_exclude_tags, search_exclude_tags_len); +- prompt ("]: "); +- +- if (strlen (response)) { +- GPtrArray *tags = parse_tag_list (ctx, response); +- +- notmuch_config_set_search_exclude_tags (config, +- (const char **) tags->pdata, +- tags->len); +- +- g_ptr_array_free (tags, TRUE); +- } +- ++ /* Temporarily remove exclude tag support for 0.12 */ + + if (! notmuch_config_save (config)) { + if (is_new) +-- +1.7.2.3 +