static const char maildir_config_comment[] =
" Maildir compatibility configuration\n"
"\n"
- " Here you can configure whether notmuch will synchronize its tags with\n"
- " maildir flags."
+ " The following option is supported here:\n"
"\n"
- "\tsynchronize_flags Valid values are true and false.\n";
+ "\tsynchronize_flags Valid values are true and false.\n"
+ "\n"
+ "\tIf true, then the following maildir flags (in message filenames)\n"
+ "\twill be synchronized with the corresponding notmuch tags:\n"
+ "\n"
+ "\t\tFlag Tag\n"
+ "\t\t---- -------\n"
+ "\t\tD draft\n"
+ "\t\tF flagged\n"
+ "\t\tP passed\n"
+ "\t\tR replied\n"
+ "\t\tS unread (added when 'S' flag is not present)\n"
+ "\n"
+ "\tThe \"notmuch new\" command will notice flag changes in filenames\n"
+ "\tand update tags, while the \"notmuch tag\" and \"notmuch restore\"\n"
+ "\tcommands will notice tag changes and update flags in filenames\n";
struct _notmuch_config {
char *filename;
size_t user_other_email_length;
const char **new_tags;
size_t new_tags_length;
- notmuch_bool_t maildir_sync;
+ notmuch_bool_t maildir_synchronize_flags;
};
-#define MAILDIR_SYNC_UNDEF ((notmuch_bool_t)-1)
-
static int
notmuch_config_destructor (notmuch_config_t *config)
{
static char *
get_name_from_passwd_file (void *ctx)
{
- long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);
- char *pw_buf = talloc_zero_size (ctx, pw_buf_size);
+ long pw_buf_size;
+ char *pw_buf;
struct passwd passwd, *ignored;
char *name;
int e;
+ pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);
if (pw_buf_size == -1) pw_buf_size = 64;
+ pw_buf = talloc_size (ctx, pw_buf_size);
while ((e = getpwuid_r (getuid (), &passwd, pw_buf,
pw_buf_size, &ignored)) == ERANGE) {
static char *
get_username_from_passwd_file (void *ctx)
{
- long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);
- char *pw_buf = talloc_zero_size (ctx, pw_buf_size);
+ long pw_buf_size;
+ char *pw_buf;
struct passwd passwd, *ignored;
char *name;
int e;
+ pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);
if (pw_buf_size == -1) pw_buf_size = 64;
+ pw_buf = talloc_zero_size (ctx, pw_buf_size);
+
while ((e = getpwuid_r (getuid (), &passwd, pw_buf,
pw_buf_size, &ignored)) == ERANGE) {
pw_buf_size = pw_buf_size * 2;
config->user_other_email_length = 0;
config->new_tags = NULL;
config->new_tags_length = 0;
- config->maildir_sync = MAILDIR_SYNC_UNDEF;
+ config->maildir_synchronize_flags = TRUE;
if (! g_key_file_load_from_file (config->key_file,
config->filename,
notmuch_config_set_new_tags (config, tags, 2);
}
- if (notmuch_config_get_maildir_sync (config) == MAILDIR_SYNC_UNDEF) {
- notmuch_config_set_maildir_sync (config, FALSE);
+ error = NULL;
+ config->maildir_synchronize_flags =
+ g_key_file_get_boolean (config->key_file,
+ "maildir", "synchronize_flags", &error);
+ if (error) {
+ notmuch_config_set_maildir_synchronize_flags (config, TRUE);
+ g_error_free (error);
}
/* Whenever we know of configuration sections that don't appear in
}
notmuch_bool_t
-notmuch_config_get_maildir_sync (notmuch_config_t *config)
+notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config)
{
- GError *err = NULL;
- if (config->maildir_sync == MAILDIR_SYNC_UNDEF) {
- config->maildir_sync =
- g_key_file_get_boolean (config->key_file,
- "maildir", "synchronize_flags", &err);
- if (err) {
- config->maildir_sync = MAILDIR_SYNC_UNDEF;
- g_error_free (err);
- }
- }
- return config->maildir_sync;
+ return config->maildir_synchronize_flags;
}
void
-notmuch_config_set_maildir_sync (notmuch_config_t *config,
- notmuch_bool_t maildir_sync)
+notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config,
+ notmuch_bool_t synchronize_flags)
{
g_key_file_set_boolean (config->key_file,
- "maildir", "synchronize_flags", maildir_sync);
- config->maildir_sync = maildir_sync;
+ "maildir", "synchronize_flags", synchronize_flags);
+ config->maildir_synchronize_flags = synchronize_flags;
}