]> git.notmuchmail.org Git - notmuch/commitdiff
lib/add-message: drop use of deprecated notmuch_message_get_flag.
authorDavid Bremner <david@tethera.net>
Sat, 11 Jul 2020 18:30:06 +0000 (15:30 -0300)
committerDavid Bremner <david@tethera.net>
Sat, 18 Jul 2020 14:03:28 +0000 (11:03 -0300)
As a side effect, we revert the switch from notmuch_bool_t to bool
here. This is because those two types are not actually compatible when
passing by reference.

lib/add-message.cc

index 8c92689b0eeaf32f92916569e25f48a5fa8a9a42..9dd4b69771d25ff4f77886c1cfd46cb1602210dd 100644 (file)
@@ -477,7 +477,7 @@ notmuch_database_index_file (notmuch_database_t *notmuch,
     notmuch_message_t *message = NULL;
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS, ret2;
     notmuch_private_status_t private_status;
-    bool is_ghost = false, is_new = false;
+    notmuch_bool_t is_ghost = false, is_new = false;
     notmuch_indexopts_t *def_indexopts = NULL;
 
     const char *date;
@@ -525,7 +525,9 @@ notmuch_database_index_file (notmuch_database_t *notmuch,
            is_new = true;
            break;
        case NOTMUCH_PRIVATE_STATUS_SUCCESS:
-           is_ghost = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_GHOST);
+           ret = notmuch_message_get_flag_st (message, NOTMUCH_MESSAGE_FLAG_GHOST, &is_ghost);
+           if (ret)
+               goto DONE;
            is_new = false;
            break;
        default: