diff options
| author | David Bremner <david@tethera.net> | 2022-02-15 20:53:12 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2022-02-15 20:54:56 -0400 |
| commit | f1b2ab70c39cacb53c0b3c1d49358260a8d1818d (patch) | |
| tree | 8b06d207475c256081a10ec5eb1fbd7c959610e0 /lib/database.cc | |
| parent | cf342d7302544532a1f66fd7a1cc42df99fcd228 (diff) | |
| parent | 7b5921877e748338359a25dae578771f768183af (diff) | |
Merge tag '0.35' into debian/bullseye-backportsdebian/0.35-1_bpo11+1archive/debian/0.35-1_bpo11+1
notmuch 0.35 release
Diffstat (limited to 'lib/database.cc')
| -rw-r--r-- | lib/database.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/database.cc b/lib/database.cc index 7eb0de79..df83e204 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -311,6 +311,8 @@ notmuch_status_to_string (notmuch_status_t status) return "Database exists, not recreated"; case NOTMUCH_STATUS_BAD_QUERY_SYNTAX: return "Syntax error in query"; + case NOTMUCH_STATUS_NO_MAIL_ROOT: + return "No mail root found"; default: case NOTMUCH_STATUS_LAST_STATUS: return "Unknown error status value"; @@ -590,10 +592,12 @@ notmuch_database_compact (const char *path, notmuch_database_t *notmuch = NULL; char *message = NULL; - ret = notmuch_database_open_verbose (path, - NOTMUCH_DATABASE_MODE_READ_WRITE, - ¬much, - &message); + ret = notmuch_database_open_with_config (path, + NOTMUCH_DATABASE_MODE_READ_WRITE, + "", + NULL, + ¬much, + &message); if (ret) { if (status_cb) status_cb (message, closure); return ret; @@ -751,6 +755,8 @@ notmuch_database_destroy (notmuch_database_t *notmuch) notmuch->date_range_processor = NULL; delete notmuch->last_mod_range_processor; notmuch->last_mod_range_processor = NULL; + delete notmuch->stemmer; + notmuch->stemmer = NULL; talloc_free (notmuch); |