X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fdatabase.cc;h=88c85ed49494c1f23eb7737c0f2daef0e109cc17;hb=4e5d2f22db290a830c0267f34b519c6138af00ed;hp=2b5b64dffd9bf0499a0ca70534eba115366610b3;hpb=c5085642b8c6495ffea3d5709aa6da14cd1d8688;p=notmuch

diff --git a/lib/database.cc b/lib/database.cc
index 2b5b64df..88c85ed4 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -751,8 +751,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
 	total = notmuch_query_count_messages (query);
 
 	for (messages = notmuch_query_search_messages (query);
-	     notmuch_messages_has_more (messages);
-	     notmuch_messages_advance (messages))
+	     notmuch_messages_valid (messages);
+	     notmuch_messages_move_to_next (messages))
 	{
 	    if (do_progress_notify) {
 		progress_notify (closure, (double) count / total);
@@ -827,8 +827,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
 	char *filename;
 
 	for (messages = notmuch_query_search_messages (query);
-	     notmuch_messages_has_more (messages);
-	     notmuch_messages_advance (messages))
+	     notmuch_messages_valid (messages);
+	     notmuch_messages_move_to_next (messages))
 	{
 	    if (do_progress_notify) {
 		progress_notify (closure, (double) count / total);