lib: Rework interface for maildir_flags synchronization

[notmuch] / notmuch-tag.c

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 00588a11608bc0b5a8ead8d7f7e4a2bb804d403b..60e21e0deb8c89e02e29d3845233fa7687701668 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -45,6 +45,7 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     struct sigaction action;
+    notmuch_bool_t synchronize_flags;
     int i;
 
     /* Setup our handler for SIGINT */
@@ -101,15 +102,20 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
     if (notmuch == NULL)
        return 1;
 
+    synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
+
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
        fprintf (stderr, "Out of memory.\n");
        return 1;
     }
 
+    /* tagging is not interested in any special sort order */
+    notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
+
     for (messages = notmuch_query_search_messages (query);
-        notmuch_messages_has_more (messages) && !interrupted;
-        notmuch_messages_advance (messages))
+        notmuch_messages_valid (messages) && !interrupted;
+        notmuch_messages_move_to_next (messages))
     {
        message = notmuch_messages_get (messages);
 
@@ -124,6 +130,9 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 
        notmuch_message_thaw (message);
 
+       if (synchronize_flags)
+           notmuch_message_tags_to_maildir_flags (message);
+
        notmuch_message_destroy (message);
     }