X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fdatabase.cc;h=c91e97c125940b384a3bd24963df6cbeedd88acb;hb=b884ab2ef1b9e15b81d119089e64c2c0fa60012e;hp=2b5b64dffd9bf0499a0ca70534eba115366610b3;hpb=e0a8dee8bcf0785325c07fff5a11e8ec494826db;p=notmuch

diff --git a/lib/database.cc b/lib/database.cc
index 2b5b64df..c91e97c1 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -147,6 +147,7 @@ prefix_t BOOLEAN_PREFIX_INTERNAL[] = {
 prefix_t BOOLEAN_PREFIX_EXTERNAL[] = {
     { "thread",			"G" },
     { "tag",			"K" },
+    { "is",			"K" },
     { "id",			"Q" }
 };
 
@@ -751,8 +752,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 +828,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);