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.
---
notmuch-client.h | 4 ++--
notmuch-config.c | 32 ++++++++++++++++----------------
notmuch-count.c | 12 ++++++------
notmuch-search.c | 12 ++++++------
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/notmuch-client.h b/notmuch-client.h
index 62ede28..4bc7320 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -236,10 +236,10 @@ notmuch_config_set_maildir_synchronize_flags
(notmuch_config_t *config,
notmuch_bool_t synchronize_flags);
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
-notmuch_config_set_auto_exclude_tags (notmuch_config_t *config,
+notmuch_config_set_search_exclude_tags (notmuch_config_t *config,
const char *list[],
size_t length);
diff --git a/notmuch-config.c b/notmuch-config.c
index 3d4d5b9..687bd76 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -89,9 +89,9 @@ static const char search_config_comment[] =
"\n"
" The following option is supported here:\n"
"\n"
- "\tauto_exclude_tags A ;-separated list of tags that will be\n"
- "\t excluded from search results by default. Using an excluded tag\n"
- "\t in a query will override that exclusion.\n";
+ "\texclude_tags A list (separated by ';') of the tags that will be\n"
+ "\t\texcluded from search results by default. Using an excluded tag in
a\n"
+ "\t\tquery will override that exclusion.\n";
struct _notmuch_config {
char *filename;
@@ -105,8 +105,8 @@ struct _notmuch_config {
const char **new_tags;
size_t new_tags_length;
notmuch_bool_t maildir_synchronize_flags;
- const char **auto_exclude_tags;
- size_t auto_exclude_tags_length;
+ const char **search_exclude_tags;
+ size_t search_exclude_tags_length;
};
static int
@@ -264,8 +264,8 @@ notmuch_config_open (void *ctx,
config->new_tags = NULL;
config->new_tags_length = 0;
config->maildir_synchronize_flags = TRUE;
- config->auto_exclude_tags = NULL;
- config->auto_exclude_tags_length = 0;
+ config->search_exclude_tags = NULL;
+ config->search_exclude_tags_length = 0;
if (! g_key_file_load_from_file (config->key_file,
config->filename,
@@ -360,9 +360,9 @@ notmuch_config_open (void *ctx,
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" };
- notmuch_config_set_auto_exclude_tags (config, tags, 2);
+ notmuch_config_set_search_exclude_tags (config, tags, 2);
}
error = NULL;
@@ -623,20 +623,20 @@ notmuch_config_set_new_tags (notmuch_config_t *config,
}
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",
- &(config->auto_exclude_tags),
- &(config->auto_exclude_tags_length), length);
+ return _config_get_list (config, "search", "exclude_tags",
+ &(config->search_exclude_tags),
+ &(config->search_exclude_tags_length), length);
}
void
-notmuch_config_set_auto_exclude_tags (notmuch_config_t *config,
+notmuch_config_set_search_exclude_tags (notmuch_config_t *config,
const char *list[],
size_t length)
{
- _config_set_list (config, "search", "auto_exclude_tags", list, length,
- &(config->auto_exclude_tags));
+ _config_set_list (config, "search", "exclude_tags", list, length,
+ &(config->search_exclude_tags));
}
/* Given a configuration item of the form <group>.<key> return the
diff --git a/notmuch-count.c b/notmuch-count.c
index f77861e..63459fb 100644
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -35,8 +35,8 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
char *query_str;
int opt_index;
int output = OUTPUT_MESSAGES;
- const char **auto_exclude_tags;
- size_t auto_exclude_tags_length;
+ const char **search_exclude_tags;
+ size_t search_exclude_tags_length;
unsigned int i;
notmuch_opt_desc_t options[] = {
@@ -78,10 +78,10 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
return 1;
}
- auto_exclude_tags = notmuch_config_get_auto_exclude_tags
- (config, &auto_exclude_tags_length);
- for (i = 0; i < auto_exclude_tags_length; i++)
- notmuch_query_add_tag_exclude (query, auto_exclude_tags[i]);
+ search_exclude_tags = notmuch_config_get_search_exclude_tags
+ (config, &search_exclude_tags_length);
+ for (i = 0; i < search_exclude_tags_length; i++)
+ notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
switch (output) {
case OUTPUT_MESSAGES:
diff --git a/notmuch-search.c b/notmuch-search.c
index 8867aab..d504051 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -423,8 +423,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
output_t output = OUTPUT_SUMMARY;
int offset = 0;
int limit = -1; /* unlimited */
- const char **auto_exclude_tags;
- size_t auto_exclude_tags_length;
+ const char **search_exclude_tags;
+ size_t search_exclude_tags_length;
unsigned int i;
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);
- auto_exclude_tags = notmuch_config_get_auto_exclude_tags
- (config, &auto_exclude_tags_length);
- for (i = 0; i < auto_exclude_tags_length; i++)
- notmuch_query_add_tag_exclude (query, auto_exclude_tags[i]);
+ search_exclude_tags = notmuch_config_get_search_exclude_tags
+ (config, &search_exclude_tags_length);
+ for (i = 0; i < search_exclude_tags_length; i++)
+ notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
switch (output) {
default:
--
1.7.8.1
