X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-search.c;h=4e3514b686467ef3d719ad8a79fc546ed3acd90b;hp=25dd6eba370b4b302135dc518ca7b4db1e285484;hb=bb5211684654b7cf54f842990a733a64fe01d612;hpb=5171831813716fa09e64d37a9d6f6ba4fc418c5b

diff --git a/notmuch-search.c b/notmuch-search.c
index 25dd6eba..4e3514b6 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -146,8 +146,8 @@ do_search_threads (const void *ctx,
     fputs (format->results_start, stdout);
 
     for (threads = notmuch_query_search_threads (query);
-	 notmuch_threads_has_more (threads);
-	 notmuch_threads_advance (threads))
+	 notmuch_threads_valid (threads);
+	 notmuch_threads_move_to_next (threads))
     {
 	int first_tag = 1;
 
@@ -174,8 +174,8 @@ do_search_threads (const void *ctx,
 	fputs (format->tag_start, stdout);
 
 	for (tags = notmuch_thread_get_tags (thread);
-	     notmuch_tags_has_more (tags);
-	     notmuch_tags_advance (tags))
+	     notmuch_tags_valid (tags);
+	     notmuch_tags_move_to_next (tags))
 	{
 	    if (! first_tag)
 		fputs (format->tag_sep, stdout);