From a4ce6cfbc63c53934c4c06f1b00ffef1c560b3b5 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 7 Dec 2010 16:26:38 -0800 Subject: [PATCH] lib: Set thread subject at the same time as setting thread->{oldest,newest} We really want to change the thread subject at the same time we set the date, (if the sort order indicates this is necessary). The previous code for setting the thread subject was sensitive on the query sort when adding matching messages. An independent bug fix is about to change that query sort order, so we remove the dependency on it here. --- lib/thread.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/thread.cc b/lib/thread.cc index 7f155862..3738baa9 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -288,11 +288,17 @@ _thread_add_matched_message (notmuch_thread_t *thread, date = notmuch_message_get_date (message); - if (date < thread->oldest || ! thread->matched_messages) + if (date < thread->oldest || ! thread->matched_messages) { thread->oldest = date; + if (sort == NOTMUCH_SORT_OLDEST_FIRST) + _thread_set_subject_from_message (thread, message); + } - if (date > thread->newest || ! thread->matched_messages) + if (date > thread->newest || ! thread->matched_messages) { thread->newest = date; + if (sort != NOTMUCH_SORT_OLDEST_FIRST) + _thread_set_subject_from_message (thread, message); + } thread->matched_messages++; @@ -304,12 +310,6 @@ _thread_add_matched_message (notmuch_thread_t *thread, } _thread_add_matched_author (thread, notmuch_message_get_author (hashed_message)); - - if ((sort == NOTMUCH_SORT_OLDEST_FIRST && date <= thread->newest) || - (sort != NOTMUCH_SORT_OLDEST_FIRST && date == thread->newest)) - { - _thread_set_subject_from_message (thread, message); - } } static void