X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fthread.cc;h=1a1ecfa5507ee8cf35e243eb4b44ddfdcd0526eb;hp=79c3e9bb5d463e84b3466c76ab307dddf013c19e;hb=30c475c1ef3d6823ed9ab0affc30328726c5240f;hpb=4135a1f8dae02e712ff172ae38f68b74f9721236

diff --git a/lib/thread.cc b/lib/thread.cc
index 79c3e9bb..1a1ecfa5 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
@@ -24,7 +24,9 @@
 #include <gmime/gmime.h>
 #include <glib.h> /* GHashTable */
 
-struct visible _notmuch_thread {
+#define EMPTY_STRING(s) ((s)[0] == '\0')
+
+struct _notmuch_thread {
     notmuch_database_t *notmuch;
     char *thread_id;
     char *subject;
@@ -249,8 +251,8 @@ _thread_add_message (notmuch_thread_t *thread,
 		 term != NULL;
 		 term = term->next)
 	    {
-		/* We ignore initial 'K'. */
-		if (strcmp(tag, (term->string + 1)) == 0) {
+		/* Check for an empty string, and then ignore initial 'K'. */
+		if (*(term->string) && strcmp(tag, (term->string + 1)) == 0) {
 		    message_excluded = TRUE;
 		    break;
 		}
@@ -332,10 +334,12 @@ _thread_set_subject_from_message (notmuch_thread_t *thread,
 	cleaned_subject = talloc_strdup (thread, subject);
     }
 
-    if (thread->subject)
-	talloc_free (thread->subject);
+    if (! EMPTY_STRING(cleaned_subject)) {
+	if (thread->subject)
+	    talloc_free (thread->subject);
 
-    thread->subject = talloc_strdup (thread, cleaned_subject);
+	thread->subject = talloc_strdup (thread, cleaned_subject);
+    }
 }
 
 /* Add a message to this thread which is known to match the original
@@ -360,7 +364,8 @@ _thread_add_matched_message (notmuch_thread_t *thread,
 
     if (date > thread->newest || ! thread->matched_messages) {
 	thread->newest = date;
-	if (sort != NOTMUCH_SORT_OLDEST_FIRST)
+	const char *cur_subject = notmuch_thread_get_subject(thread);
+	if (sort != NOTMUCH_SORT_OLDEST_FIRST || EMPTY_STRING(cur_subject))
 	    _thread_set_subject_from_message (thread, message);
     }
 
@@ -442,6 +447,7 @@ _notmuch_thread_create (void *ctx,
 
     notmuch_messages_t *messages;
     notmuch_message_t *message;
+    notmuch_status_t status;
 
     seed_message = _notmuch_message_create (local, notmuch, seed_doc_id, NULL);
     if (! seed_message)
@@ -499,7 +505,11 @@ _notmuch_thread_create (void *ctx,
      * oldest or newest subject is desired. */
     notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
 
-    for (messages = notmuch_query_search_messages (thread_id_query);
+    status = notmuch_query_search_messages (thread_id_query, &messages);
+    if (status)
+	goto DONE;
+
+    for (;
 	 notmuch_messages_valid (messages);
 	 notmuch_messages_move_to_next (messages))
     {