mirror of
https://git.notmuchmail.org/git/notmuch
synced 2025-01-03 15:21:41 +01:00
lib: Remove condition regarding a NULL parent_thread_id.
A recent change guaranteed that a message ID can never be resolved to a NULL thread ID, so we don't need this extra case.
This commit is contained in:
parent
071022c253
commit
14073b8851
1 changed files with 7 additions and 9 deletions
|
@ -1321,15 +1321,13 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
|
|||
message,
|
||||
parent_message_id);
|
||||
|
||||
if (parent_thread_id != NULL) {
|
||||
if (*thread_id == NULL) {
|
||||
*thread_id = talloc_strdup (message, parent_thread_id);
|
||||
_notmuch_message_add_term (message, "thread", *thread_id);
|
||||
} else if (strcmp (*thread_id, parent_thread_id)) {
|
||||
ret = _merge_threads (notmuch, *thread_id, parent_thread_id);
|
||||
if (ret)
|
||||
goto DONE;
|
||||
}
|
||||
if (*thread_id == NULL) {
|
||||
*thread_id = talloc_strdup (message, parent_thread_id);
|
||||
_notmuch_message_add_term (message, "thread", *thread_id);
|
||||
} else if (strcmp (*thread_id, parent_thread_id)) {
|
||||
ret = _merge_threads (notmuch, *thread_id, parent_thread_id);
|
||||
if (ret)
|
||||
goto DONE;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue