debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/thread: replace use of deprecated notmuch_message_get_flag

Browse source 
This adds one more reason why _notmuch_thread_create might return
NULL, but those were not previously enumerated, so no promises are
broken.
This commit is contained in:
David Bremner 2020-07-11 15:30:07 -03:00
parent a4776faa9b
commit c8539d5e92
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/thread.cc
View file

@ -351,14 +351,16 @@ _thread_set_subject_from_message (notmuch_thread_t *thread,
/* Add a message to this thread which is known to match the original /* Add a message to this thread which is known to match the original
* search specification. The 'sort' parameter controls whether the * search specification. The 'sort' parameter controls whether the
* oldest or newest matching subject is applied to the thread as a * oldest or newest matching subject is applied to the thread as a
* whole. */ * whole. Returns 0 on success.
static void */
static int
_thread_add_matched_message (notmuch_thread_t *thread, _thread_add_matched_message (notmuch_thread_t *thread,
notmuch_message_t *message, notmuch_message_t *message,
notmuch_sort_t sort) notmuch_sort_t sort)
{ {
time_t date; time_t date;
notmuch_message_t *hashed_message; notmuch_message_t *hashed_message;
notmuch_bool_t is_set;
date = notmuch_message_get_date (message); date = notmuch_message_get_date (message);
@ -375,7 +377,9 @@ _thread_add_matched_message (notmuch_thread_t *thread,
_thread_set_subject_from_message (thread, message); _thread_set_subject_from_message (thread, message);
} }
if (! notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED)) if (notmuch_message_get_flag_st (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, &is_set))
return -1;
if (! is_set)
thread->matched_messages++; thread->matched_messages++;
if (g_hash_table_lookup_extended (thread->message_hash, if (g_hash_table_lookup_extended (thread->message_hash,
@ -386,6 +390,7 @@ _thread_add_matched_message (notmuch_thread_t *thread,
} }
_thread_add_matched_author (thread, _notmuch_message_get_author (hashed_message)); _thread_add_matched_author (thread, _notmuch_message_get_author (hashed_message));
return 0;
} }
static bool static bool
@ -625,7 +630,10 @@ _notmuch_thread_create (void *ctx,
if ( _notmuch_doc_id_set_contains (match_set, doc_id)) { if ( _notmuch_doc_id_set_contains (match_set, doc_id)) {
_notmuch_doc_id_set_remove (match_set, doc_id); _notmuch_doc_id_set_remove (match_set, doc_id);
_thread_add_matched_message (thread, message, sort); if (_thread_add_matched_message (thread, message, sort)) {
thread = NULL;
goto DONE;
}
} }
_notmuch_message_close (message); _notmuch_message_close (message);