lib: Indicate if there are more filenames after removal.
authorAustin Clements <amdragon@mit.edu>
Sun, 6 Feb 2011 09:17:49 +0000 (04:17 -0500)
committerDavid Bremner <bremner@debian.org>
Sat, 24 Sep 2011 01:50:39 +0000 (21:50 -0400)
Make _notmuch_message_remove_filename return
NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID if the message has more filenames
and fix callers to handle this.

lib/message.cc

index 424081f168d3a36c0070d5b630cba199d36bb7ef..20b77580227b8c94a1b12b1a9e3cac050a2236ce 100644 (file)
@@ -501,6 +501,9 @@ _notmuch_message_add_filename (notmuch_message_t *message,
  * This change will not be reflected in the database until the next
  * call to _notmuch_message_sync.
  *
  * This change will not be reflected in the database until the next
  * call to _notmuch_message_sync.
  *
+ * If this message still has other filenames, returns
+ * NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID.
+ *
  * Note: This function does not remove a document from the database,
  * even if the specified filename is the only filename for this
  * message. For that functionality, see
  * Note: This function does not remove a document from the database,
  * even if the specified filename is the only filename for this
  * message. For that functionality, see
@@ -590,6 +593,9 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
        if (strncmp ((*i).c_str (), direntry_prefix, direntry_prefix_len))
            break;
 
        if (strncmp ((*i).c_str (), direntry_prefix, direntry_prefix_len))
            break;
 
+       /* Indicate that there are filenames remaining. */
+       status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
+
        direntry = (*i).c_str ();
        direntry += direntry_prefix_len;
 
        direntry = (*i).c_str ();
        direntry += direntry_prefix_len;
 
@@ -1282,7 +1288,8 @@ notmuch_message_tags_to_maildir_flags (notmuch_message_t *message)
            new_status = _notmuch_message_remove_filename (message,
                                                           filename);
            /* Hold on to only the first error. */
            new_status = _notmuch_message_remove_filename (message,
                                                           filename);
            /* Hold on to only the first error. */
-           if (! status && new_status) {
+           if (! status && new_status
+               && new_status != NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
                status = new_status;
                continue;
            }
                status = new_status;
                continue;
            }