emacs: Fix the notmuch-search-authors-width variable.

[notmuch] / lib / thread.cc

diff --git a/lib/thread.cc b/lib/thread.cc
index 9e4cb5c89174cc697af2c3f828a66eeb9497024a..1c8b39d208bc89a780675da6f27f98de0b168b97 100644 (file)
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -119,8 +119,8 @@ _thread_add_message (notmuch_thread_t *thread,
     }
 
     for (tags = notmuch_message_get_tags (message);
-        notmuch_tags_has_more (tags);
-        notmuch_tags_advance (tags))
+        notmuch_tags_valid (tags);
+        notmuch_tags_move_to_next (tags))
     {
        tag = notmuch_tags_get (tags);
        g_hash_table_insert (thread->tags, xstrdup (tag), NULL);
@@ -148,7 +148,7 @@ _thread_add_matched_message (notmuch_thread_t *thread,
                            notmuch_message_get_message_id (message), NULL,
                            (void **) &hashed_message)) {
        notmuch_message_set_flag (hashed_message,
-                       NOTMUCH_MSG_FLAG_MATCHING_SEARCH, 1);
+                                 NOTMUCH_MESSAGE_FLAG_MATCH, 1);
     }
 }
 
@@ -269,8 +269,8 @@ _notmuch_thread_create (void *ctx,
     notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
 
     for (messages = notmuch_query_search_messages (thread_id_query);
-        notmuch_messages_has_more (messages);
-        notmuch_messages_advance (messages))
+        notmuch_messages_valid (messages);
+        notmuch_messages_move_to_next (messages))
     {
        message = notmuch_messages_get (messages);
        _thread_add_message (thread, message);
@@ -278,10 +278,9 @@ _notmuch_thread_create (void *ctx,
     }
 
     notmuch_query_destroy (thread_id_query);
-
     for (messages = notmuch_query_search_messages (matched_query);
-        notmuch_messages_has_more (messages);
-        notmuch_messages_advance (messages))
+        notmuch_messages_valid (messages);
+        notmuch_messages_move_to_next (messages))
     {
        message = notmuch_messages_get (messages);
        _thread_add_matched_message (thread, message);