[RFC PATCH 2/3] cli: add reply.honor_followup_to configuration option
Jani Nikula
jani at nikula.org
Sat Mar 2 11:55:20 PST 2013
The reply.honor_followup_to configuration option determines whether
notmuch reply takes into account the Mail-Followup-To: header in
incoming messages.
---
notmuch-client.h | 7 +++++++
notmuch-config.c | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/notmuch-client.h b/notmuch-client.h
index 5f28836..54df811 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -304,6 +304,13 @@ notmuch_config_set_new_ignore (notmuch_config_t *config,
size_t length);
notmuch_bool_t
+notmuch_config_get_reply_honor_followup_to (notmuch_config_t *config);
+
+void
+notmuch_config_set_reply_honor_followup_to (notmuch_config_t *config,
+ notmuch_bool_t honor_followup_to);
+
+notmuch_bool_t
notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config);
void
diff --git a/notmuch-config.c b/notmuch-config.c
index 45b4c0e..69c4bee 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -53,6 +53,17 @@ static const char new_config_comment[] =
"\t names will be ignored, independent of its depth/location\n"
"\t in the mail store.\n";
+static const char reply_config_comment[] =
+ " Configuration for \"notmuch reply\"\n"
+ "\n"
+ " The following option is supported here:\n"
+ "\n"
+ "\thonor_followup_to Valid values are true and false.\n"
+ "\n"
+ "\tIf true, \"notmuch reply\" will honor the \"Mail-Followup-To:\""
+ "\theader in incoming messages. (This will not generate the headers"
+ "\tto outgoing messages.)\n";
+
static const char user_config_comment[] =
" User configuration\n"
"\n"
@@ -114,6 +125,7 @@ struct _notmuch_config {
size_t new_tags_length;
const char **new_ignore;
size_t new_ignore_length;
+ notmuch_bool_t reply_honor_followup_to;
notmuch_bool_t maildir_synchronize_flags;
const char **search_exclude_tags;
size_t search_exclude_tags_length;
@@ -240,6 +252,7 @@ notmuch_config_open (void *ctx,
char *notmuch_config_env = NULL;
int file_had_database_group;
int file_had_new_group;
+ int file_had_reply_group;
int file_had_user_group;
int file_had_maildir_group;
int file_had_search_group;
@@ -275,6 +288,7 @@ notmuch_config_open (void *ctx,
config->new_tags_length = 0;
config->new_ignore = NULL;
config->new_ignore_length = 0;
+ config->reply_honor_followup_to = FALSE;
config->maildir_synchronize_flags = TRUE;
config->search_exclude_tags = NULL;
config->search_exclude_tags_length = 0;
@@ -319,6 +333,7 @@ notmuch_config_open (void *ctx,
file_had_database_group = g_key_file_has_group (config->key_file,
"database");
file_had_new_group = g_key_file_has_group (config->key_file, "new");
+ file_had_reply_group = g_key_file_has_group (config->key_file, "reply");
file_had_user_group = g_key_file_has_group (config->key_file, "user");
file_had_maildir_group = g_key_file_has_group (config->key_file, "maildir");
file_had_search_group = g_key_file_has_group (config->key_file, "search");
@@ -386,6 +401,15 @@ notmuch_config_open (void *ctx,
}
error = NULL;
+ config->reply_honor_followup_to =
+ g_key_file_get_boolean (config->key_file,
+ "reply", "honor_followup_to", &error);
+ if (error) {
+ notmuch_config_set_reply_honor_followup_to (config, FALSE);
+ g_error_free (error);
+ }
+
+ error = NULL;
config->maildir_synchronize_flags =
g_key_file_get_boolean (config->key_file,
"maildir", "synchronize_flags", &error);
@@ -409,6 +433,10 @@ notmuch_config_open (void *ctx,
g_key_file_set_comment (config->key_file, "new", NULL,
new_config_comment, NULL);
+ if (! file_had_reply_group)
+ g_key_file_set_comment (config->key_file, "reply", NULL,
+ reply_config_comment, NULL);
+
if (! file_had_user_group)
g_key_file_set_comment (config->key_file, "user", NULL,
user_config_comment, NULL);
@@ -868,6 +896,21 @@ notmuch_config_command (void *ctx, int argc, char *argv[])
}
notmuch_bool_t
+notmuch_config_get_reply_honor_followup_to (notmuch_config_t *config)
+{
+ return config->reply_honor_followup_to;
+}
+
+void
+notmuch_config_set_reply_honor_followup_to (notmuch_config_t *config,
+ notmuch_bool_t honor_followup_to)
+{
+ g_key_file_set_boolean (config->key_file,
+ "reply", "honor_followup_to", honor_followup_to);
+ config->reply_honor_followup_to = honor_followup_to;
+}
+
+notmuch_bool_t
notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config)
{
return config->maildir_synchronize_flags;
--
1.7.10.4
More information about the notmuch
mailing list