Merge branch 'release'

[notmuch] / lib / message.cc

diff --git a/lib/message.cc b/lib/message.cc
index 978de066d4185ee991794bfad1f50140dd9424d6..8720c1b542d839a24613991b4b425fe03f65e1e3 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -462,9 +462,9 @@ notmuch_message_get_thread_id (notmuch_message_t *message)
 
 void
 _notmuch_message_add_reply (notmuch_message_t *message,
 
 void
 _notmuch_message_add_reply (notmuch_message_t *message,

-                           notmuch_message_node_t *reply)
+                           notmuch_message_t *reply)

 {
 {

-    _notmuch_message_list_append (message->replies, reply);
+    _notmuch_message_list_add_message (message->replies, reply);

 }
 
 notmuch_messages_t *
 }
 
 notmuch_messages_t *


@@ -788,7 +788,9 @@ notmuch_message_get_tags (notmuch_message_t *message)
      * possible to modify the message tags (which talloc_unlink's the
      * current list from the message) while still iterating because
      * the iterator will keep the current list alive. */
      * possible to modify the message tags (which talloc_unlink's the
      * current list from the message) while still iterating because
      * the iterator will keep the current list alive. */

-    talloc_reference (message, message->tag_list);
+    if (!talloc_reference (message, message->tag_list))
+       return NULL;
+

     return tags;
 }
 
     return tags;
 }