fix new->cur maildir move

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index a3378dcb9932d1c2019e7b8d3b31643a165b4f89..c4088bce31b033add03070ed71fc92d9facdbc66 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -641,7 +641,7 @@ static void append_message(CONTEXT *ctx, notmuch_message_t *msg)
                if (folder) {
                        FILE *f = maildir_open_find_message(folder, path, &newpath);
                        if (f) {
-                               h = maildir_parse_stream(M_MAILDIR, f, path, 0, NULL);
+                               h = maildir_parse_stream(M_MAILDIR, f, newpath, 0, NULL);
                                fclose(f);
 
                                dprint(1, (debugfile, "nm: not up-to-date: %s -> %s\n",
@@ -936,7 +936,7 @@ int nm_sync(CONTEXT *ctx, int *index_hint)
                                        break;
                        }
                        if (h->deleted) {
-                               dprint(2, (debugfile, "nm: remove filename '%s'\n", old));
+                               dprint(2, (debugfile, "nm: delete filename '%s'\n", old));
                                notmuch_database_remove_message(db, old);
                                changed = 1;
                        } else if (*new && *old) {