X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase.cc;h=c91e97c125940b384a3bd24963df6cbeedd88acb;hp=8641321511bd12c85eac6e1c91fe9c486d92e4c5;hb=a48f3687785b2c138b2c47848bd05512fc893a0b;hpb=9439b217c349478b3603d5368f534acb1cd23974

diff --git a/lib/database.cc b/lib/database.cc
index 86413215..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);
@@ -1306,7 +1307,7 @@ _notmuch_database_generate_thread_id (notmuch_database_t *notmuch)
 
     notmuch->last_thread_id++;
 
-    sprintf (thread_id, "%016llx", notmuch->last_thread_id);
+    sprintf (thread_id, "%016" PRIx64, notmuch->last_thread_id);
 
     db->set_metadata ("last_thread_id", thread_id);