diff options
| -rw-r--r-- | notmuch-config.c | 23 | ||||
| -rwxr-xr-x | test/maildir-sync | 5 |
2 files changed, 8 insertions, 20 deletions
diff --git a/notmuch-config.c b/notmuch-config.c index bace8e56..45a5367b 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -97,8 +97,6 @@ struct _notmuch_config { notmuch_bool_t maildir_synchronize_flags; }; -#define MAILDIR_SYNC_UNDEF ((notmuch_bool_t)-1) - static int notmuch_config_destructor (notmuch_config_t *config) { @@ -247,7 +245,7 @@ notmuch_config_open (void *ctx, config->user_other_email_length = 0; config->new_tags = NULL; config->new_tags_length = 0; - config->maildir_synchronize_flags = MAILDIR_SYNC_UNDEF; + config->maildir_synchronize_flags = TRUE; if (! g_key_file_load_from_file (config->key_file, config->filename, @@ -341,8 +339,13 @@ notmuch_config_open (void *ctx, notmuch_config_set_new_tags (config, tags, 2); } - if (notmuch_config_get_maildir_synchronize_flags (config) == MAILDIR_SYNC_UNDEF) { - notmuch_config_set_maildir_synchronize_flags (config, FALSE); + error = NULL; + config->maildir_synchronize_flags = + g_key_file_get_boolean (config->key_file, + "maildir", "synchronize_flags", &error); + if (error) { + config->maildir_synchronize_flags = TRUE; + g_error_free (error); } /* Whenever we know of configuration sections that don't appear in @@ -745,16 +748,6 @@ notmuch_config_command (void *ctx, int argc, char *argv[]) notmuch_bool_t notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config) { - GError *err = NULL; - if (config->maildir_synchronize_flags == MAILDIR_SYNC_UNDEF) { - config->maildir_synchronize_flags = - g_key_file_get_boolean (config->key_file, - "maildir", "synchronize_flags", &err); - if (err) { - config->maildir_synchronize_flags = MAILDIR_SYNC_UNDEF; - g_error_free (err); - } - } return config->maildir_synchronize_flags; } diff --git a/test/maildir-sync b/test/maildir-sync index 363534aa..d3931a1f 100755 --- a/test/maildir-sync +++ b/test/maildir-sync @@ -12,11 +12,6 @@ filter_show_json() { echo } -cat >> "$NOTMUCH_CONFIG" <<EOF -[maildir] -synchronize_flags=true -EOF - # Create the expected maildir structure mkdir $MAIL_DIR/cur mkdir $MAIL_DIR/new |