X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=3d628c23f2c8bb20ba6aa3cc49b91407a117afe6;hp=273916e6d1611eb89f49c30119c8d25bf76d6ab5;hb=0100df8edbc84d95210c369b9eb560b87c2d36be;hpb=d9d3d3e6f06a76dc0fbe24c9655b64acfcd4b9e4

diff --git a/notmuch-new.c b/notmuch-new.c
index 273916e6..3d628c23 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -45,7 +45,7 @@ typedef struct {
 
     _filename_list_t *removed_files;
     _filename_list_t *removed_directories;
-    notmuch_bool_t maildir_sync;
+    notmuch_bool_t synchronize_flags;
 } add_files_state_t;
 
 static volatile sig_atomic_t do_add_files_print_progress = 0;
@@ -411,13 +411,13 @@ add_files_recursive (notmuch_database_t *notmuch,
 	    state->added_messages++;
 	    for (tag=state->new_tags; *tag != NULL; tag++)
 	        notmuch_message_add_tag (message, *tag);
-	    if (state->maildir_sync == TRUE)
-		notmuch_message_maildir_to_tags (message, next);
+	    if (state->synchronize_flags == TRUE)
+		notmuch_message_maildir_flags_to_tags (message);
 	    break;
 	/* Non-fatal issues (go on to next file) */
 	case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
-	    if (state->maildir_sync == TRUE)
-		notmuch_message_maildir_to_tags (message, next);
+	    if (state->synchronize_flags == TRUE)
+		notmuch_message_maildir_flags_to_tags (message);
 	    break;
 	case NOTMUCH_STATUS_FILE_NOT_EMAIL:
 	    fprintf (stderr, "Note: Ignoring non-mail file: %s\n",
@@ -741,7 +741,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 	return 1;
 
     add_files_state.new_tags = notmuch_config_get_new_tags (config, &add_files_state.new_tags_length);
-    add_files_state.maildir_sync = notmuch_config_get_maildir_sync (config);
+    add_files_state.synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
     db_path = notmuch_config_get_database_path (config);
 
     dot_notmuch_path = talloc_asprintf (ctx, "%s/%s", db_path, ".notmuch");