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

lib: Simplify code to set subject from matched message.

Browse source 
Simply moving the code from _add_matched_message to a new
_set_subject_from_message function.
This commit is contained in:
Carl Worth 2010-04-24 06:45:51 -07:00
parent d06a34ad5d
commit 7c421b87b0
1 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
lib/thread.cc
View file

@ -128,21 +128,9 @@ _thread_add_message (notmuch_thread_t *thread,
} }
static void static void
_thread_add_matched_message (notmuch_thread_t *thread, _thread_set_subject_from_message (notmuch_thread_t *thread,
notmuch_message_t *message, notmuch_message_t *message)
notmuch_sort_t sort)
{ {
time_t date;
notmuch_message_t *hashed_message;
date = notmuch_message_get_date (message);
if (date < thread->oldest || ! thread->matched_messages)
thread->oldest = date;
if (date > thread->newest || ! thread->matched_messages)
thread->newest = date;
const char *subject; const char *subject;
const char *cleaned_subject; const char *cleaned_subject;
@ -160,10 +148,27 @@ _thread_add_matched_message (notmuch_thread_t *thread,
cleaned_subject = talloc_strdup (thread, subject); cleaned_subject = talloc_strdup (thread, subject);
} }
if ((sort == NOTMUCH_SORT_OLDEST_FIRST && date <= thread->newest) || if (thread->subject)
(sort != NOTMUCH_SORT_OLDEST_FIRST && date == thread->newest)) { talloc_free (thread->subject);
thread->subject = talloc_strdup (thread, cleaned_subject);
} thread->subject = talloc_strdup (thread, cleaned_subject);
}
static void
_thread_add_matched_message (notmuch_thread_t *thread,
notmuch_message_t *message,
notmuch_sort_t sort)
{
time_t date;
notmuch_message_t *hashed_message;
date = notmuch_message_get_date (message);
if (date < thread->oldest || ! thread->matched_messages)
thread->oldest = date;
if (date > thread->newest || ! thread->matched_messages)
thread->newest = date;
thread->matched_messages++; thread->matched_messages++;
@ -173,6 +178,12 @@ _thread_add_matched_message (notmuch_thread_t *thread,
notmuch_message_set_flag (hashed_message, notmuch_message_set_flag (hashed_message,
NOTMUCH_MESSAGE_FLAG_MATCH, 1); NOTMUCH_MESSAGE_FLAG_MATCH, 1);
} }
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 static void