diff options
| author |  David Bremner <bremner@debian.org> | 2012-05-23 22:48:16 -0300 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2012-05-23 22:48:16 -0300 |
| commit | 6d44c5af6568d2a559c163ace14d27cc7e2ba1bc (patch) | |
| tree | f8d8290136c602190b8712f3c0e4a7030b7793c7 /lib/message.cc | |
| parent | 4c526fe3515e65ddf7ca69bf7bbc0823b4e801a0 (diff) | |
| parent | d9f61c26a1344b123c1812392bc39c32634a099a (diff) | |
Merge branch 'release'
merge 0.13.1 bugfix patches back to master, fixes for emacs reply and
spurious directory document creation.
Diffstat (limited to 'lib/message.cc')
| -rw-r--r-- | lib/message.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/message.cc b/lib/message.cc index 00754254..67875065 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -495,9 +495,8 @@ _notmuch_message_add_filename (notmuch_message_t *message, if (status) return status; - status = _notmuch_database_filename_to_direntry (local, - message->notmuch, - filename, &direntry); + status = _notmuch_database_filename_to_direntry ( + local, message->notmuch, filename, NOTMUCH_FIND_CREATE, &direntry); if (status) return status; @@ -541,9 +540,9 @@ _notmuch_message_remove_filename (notmuch_message_t *message, notmuch_status_t status; Xapian::TermIterator i, last; - status = _notmuch_database_filename_to_direntry (local, message->notmuch, - filename, &direntry); - if (status) + status = _notmuch_database_filename_to_direntry ( + local, message->notmuch, filename, NOTMUCH_FIND_LOOKUP, &direntry); + if (status || !direntry) return status; /* Unlink this file from its parent directory. */ |