mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-21 18:38:08 +01:00
config: disable addition of exclude tags for 0.12
This disables the addition of search_exclude_tags in notmuch-setup and notmuch-config.
This commit is contained in:
parent
2c077b1e4a
commit
e77b031a86
2 changed files with 2 additions and 20 deletions
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue