lib: Remove condition regarding a NULL parent_thread_id.
authorCarl Worth <cworth@cworth.org>
Mon, 12 Apr 2010 22:54:03 +0000 (15:54 -0700)
committerCarl Worth <cworth@cworth.org>
Mon, 12 Apr 2010 22:54:03 +0000 (15:54 -0700)
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.

lib/database.cc

index ff6f100db98f6db7e4ae237b9c3efb4dfc33093b..6842fafadad86967b4363abd5869a2aeaef345c2 100644 (file)
@@ -1321,15 +1321,13 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
                                                             message,
                                                             parent_message_id);
 
                                                             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;
        }
     }
 
        }
     }