debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

search: rename auto_exclude_tags to {search, }exclude_tags

Browse source 
All other config-related functions and args include the section
title in their name, so for the sake of consistency, mirror that.

Also, the "auto"matic part is a given, so that was dropped.
This commit is contained in:
Pieter Praet 2012-01-23 05:22:32 +01:00 committed by David Bremner
parent 0bd09f8446
commit 649a9f5f3a
4 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
notmuch-client.h
View file

@ -252,10 +252,10 @@ notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config,
notmuch_bool_t synchronize_flags); notmuch_bool_t synchronize_flags);
const char ** const char **
notmuch_config_get_auto_exclude_tags (notmuch_config_t *config, size_t *length); notmuch_config_get_search_exclude_tags (notmuch_config_t *config, size_t *length);
void void
notmuch_config_set_auto_exclude_tags (notmuch_config_t *config, notmuch_config_set_search_exclude_tags (notmuch_config_t *config,
const char *list[], const char *list[],
size_t length); size_t length);

28
notmuch-config.c
View file

@ -89,7 +89,7 @@ static const char search_config_comment[] =
"\n" "\n"
" The following option is supported here:\n" " The following option is supported here:\n"
"\n" "\n"
"\tauto_exclude_tags\n" "\texclude_tags\n"
"\t\tA ;-separated list of tags that will be excluded from\n" "\t\tA ;-separated list of tags that will be excluded from\n"
"\t\tsearch results by default. Using an excluded tag in a\n" "\t\tsearch results by default. Using an excluded tag in a\n"
"\t\tquery will override that exclusion.\n"; "\t\tquery will override that exclusion.\n";
@ -106,8 +106,8 @@ struct _notmuch_config {
const char **new_tags; const char **new_tags;
size_t new_tags_length; size_t new_tags_length;
notmuch_bool_t maildir_synchronize_flags; notmuch_bool_t maildir_synchronize_flags;
const char **auto_exclude_tags; const char **search_exclude_tags;
size_t auto_exclude_tags_length; size_t search_exclude_tags_length;
}; };
static int static int
@ -265,8 +265,8 @@ notmuch_config_open (void *ctx,
config->new_tags = NULL; config->new_tags = NULL;
config->new_tags_length = 0; config->new_tags_length = 0;
config->maildir_synchronize_flags = TRUE; config->maildir_synchronize_flags = TRUE;
config->auto_exclude_tags = NULL; config->search_exclude_tags = NULL;
config->auto_exclude_tags_length = 0; config->search_exclude_tags_length = 0;
if (! g_key_file_load_from_file (config->key_file, if (! g_key_file_load_from_file (config->key_file,
config->filename, config->filename,
@ -361,9 +361,9 @@ notmuch_config_open (void *ctx,
notmuch_config_set_new_tags (config, tags, 2); notmuch_config_set_new_tags (config, tags, 2);
} }
if (notmuch_config_get_auto_exclude_tags (config, &tmp) == NULL) { if (notmuch_config_get_search_exclude_tags (config, &tmp) == NULL) {
const char *tags[] = { "deleted", "spam" }; const char *tags[] = { "deleted", "spam" };
notmuch_config_set_auto_exclude_tags (config, tags, 2); notmuch_config_set_search_exclude_tags (config, tags, 2);
} }
error = NULL; error = NULL;
@ -624,20 +624,20 @@ notmuch_config_set_new_tags (notmuch_config_t *config,
} }
const char ** const char **
notmuch_config_get_auto_exclude_tags (notmuch_config_t *config, size_t *length) notmuch_config_get_search_exclude_tags (notmuch_config_t *config, size_t *length)
{ {
return _config_get_list (config, "search", "auto_exclude_tags", return _config_get_list (config, "search", "exclude_tags",
&(config->auto_exclude_tags), &(config->search_exclude_tags),
&(config->auto_exclude_tags_length), length); &(config->search_exclude_tags_length), length);
} }
void void
notmuch_config_set_auto_exclude_tags (notmuch_config_t *config, notmuch_config_set_search_exclude_tags (notmuch_config_t *config,
const char *list[], const char *list[],
size_t length) size_t length)
{ {
_config_set_list (config, "search", "auto_exclude_tags", list, length, _config_set_list (config, "search", "exclude_tags", list, length,
&(config->auto_exclude_tags)); &(config->search_exclude_tags));
} }
/* Given a configuration item of the form <group>.<key> return the /* Given a configuration item of the form <group>.<key> return the

12
notmuch-count.c
View file

@ -35,8 +35,8 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
char *query_str; char *query_str;
int opt_index; int opt_index;
int output = OUTPUT_MESSAGES; int output = OUTPUT_MESSAGES;
const char **auto_exclude_tags; const char **search_exclude_tags;
size_t auto_exclude_tags_length; size_t search_exclude_tags_length;
unsigned int i; unsigned int i;
notmuch_opt_desc_t options[] = { notmuch_opt_desc_t options[] = {
@ -78,10 +78,10 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
return 1; return 1;
} }
auto_exclude_tags = notmuch_config_get_auto_exclude_tags search_exclude_tags = notmuch_config_get_search_exclude_tags
(config, &auto_exclude_tags_length); (config, &search_exclude_tags_length);
for (i = 0; i < auto_exclude_tags_length; i++) for (i = 0; i < search_exclude_tags_length; i++)
notmuch_query_add_tag_exclude (query, auto_exclude_tags[i]); notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
switch (output) { switch (output) {
case OUTPUT_MESSAGES: case OUTPUT_MESSAGES:

12
notmuch-search.c
View file

@ -423,8 +423,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
output_t output = OUTPUT_SUMMARY; output_t output = OUTPUT_SUMMARY;
int offset = 0; int offset = 0;
int limit = -1; /* unlimited */ int limit = -1; /* unlimited */
const char **auto_exclude_tags; const char **search_exclude_tags;
size_t auto_exclude_tags_length; size_t search_exclude_tags_length;
unsigned int i; unsigned int i;
enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT } enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }
@ -493,10 +493,10 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
notmuch_query_set_sort (query, sort); notmuch_query_set_sort (query, sort);
auto_exclude_tags = notmuch_config_get_auto_exclude_tags search_exclude_tags = notmuch_config_get_search_exclude_tags
(config, &auto_exclude_tags_length); (config, &search_exclude_tags_length);
for (i = 0; i < auto_exclude_tags_length; i++) for (i = 0; i < search_exclude_tags_length; i++)
notmuch_query_add_tag_exclude (query, auto_exclude_tags[i]); notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
switch (output) { switch (output) {
default: default: