X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-config.c;h=d86c0424a4920bcd712c5d72f8822ef4e195a133;hp=bace8e567fb465251f4213988e464ff705b423c9;hb=3c7a52890c2b3aacd94ef29d9c7eadc4cd1c33a7;hpb=937ecd5057659474aa3f7ffe9d2a5d850a641567

diff --git a/notmuch-config.c b/notmuch-config.c
index bace8e56..d86c0424 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -77,7 +77,7 @@ static const char maildir_config_comment[] =
     "\t\tF	flagged\n"
     "\t\tP	passed\n"
     "\t\tR	replied\n"
-    "\t\tS	unread (added when 'S' tag is not present)\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"
@@ -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) {
+	notmuch_config_set_maildir_synchronize_flags (config, 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;
 }