X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fmessage.cc;h=7c7ea7a1c02aa84d47e9ff8f3db82216d9aedbce;hb=851c97aed727d284872992dcf6b64bc2069c1d0e;hp=03b8c812eeef3238a7b5e7affde23f7b53bf85d6;hpb=12c91e8050eb0ae1ec68e1639560f8eba4654d9b;p=notmuch

diff --git a/lib/message.cc b/lib/message.cc
index 03b8c812..7c7ea7a1 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -318,7 +318,7 @@ _notmuch_message_get_in_reply_to (notmuch_message_t *message)
     in_reply_to = *i;
 
     if (i != message->doc.termlist_end () &&
-	strncmp ((*i).c_str (), prefix, prefix_len))
+	strncmp ((*i).c_str (), prefix, prefix_len) == 0)
     {
        INTERNAL_ERROR ("Message %s has duplicate In-Reply-To IDs: %s and %s\n",
 			notmuch_message_get_message_id (message),
@@ -396,9 +396,7 @@ void
 _notmuch_message_set_filename (notmuch_message_t *message,
 			       const char *filename)
 {
-    const char *s;
-    const char *db_path;
-    unsigned int db_path_len;
+    const char *relative;
 
     if (message->filename) {
 	talloc_free (message->filename);
@@ -408,22 +406,8 @@ _notmuch_message_set_filename (notmuch_message_t *message,
     if (filename == NULL)
 	INTERNAL_ERROR ("Message filename cannot be NULL.");
 
-    s = filename;
-
-    db_path = notmuch_database_get_path (message->notmuch);
-    db_path_len = strlen (db_path);
-
-    if (*s == '/' && strlen (s) > db_path_len
-	&& strncmp (s, db_path, db_path_len) == 0)
-    {
-	s += db_path_len;
-	while (*s == '/') s++;
-
-	if (!*s)
-		INTERNAL_ERROR ("Message filename was same as db prefix.");
-    }
-
-    message->doc.set_data (s);
+    relative = _notmuch_database_relative_path (message->notmuch, filename);
+    message->doc.set_data (relative);
 }
 
 const char *