diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-10-20 22:25:38 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-10-21 19:52:47 -0300 |
| commit | 20ff9de24de47e591dd45e7dde0ac10948d6cbf6 (patch) | |
| tree | 2d711341b2384283466ecbd1555e064b8414e119 /lib/add-message.cc | |
| parent | d6929040a4828cf17fb1a4f4d49b95816a5e7b7c (diff) | |
index: implement notmuch_indexopts_t with try_decrypt
This is currently mostly a wrapper around _notmuch_crypto_t that keeps
its internals private and doesn't expose any of the GMime API.
However, non-crypto indexing options might also be added later
(e.g. filters or other transformations).
Diffstat (limited to 'lib/add-message.cc')
| -rw-r--r-- | lib/add-message.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/add-message.cc b/lib/add-message.cc index bce10a0f..34099ed5 100644 --- a/lib/add-message.cc +++ b/lib/add-message.cc @@ -460,7 +460,7 @@ _notmuch_database_link_message (notmuch_database_t *notmuch, notmuch_status_t notmuch_database_index_file (notmuch_database_t *notmuch, const char *filename, - notmuch_indexopts_t unused (*indexopts), + notmuch_indexopts_t *indexopts, notmuch_message_t **message_ret) { notmuch_message_file_t *message_file; @@ -468,6 +468,7 @@ notmuch_database_index_file (notmuch_database_t *notmuch, notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS, ret2; notmuch_private_status_t private_status; bool is_ghost = false, is_new = false; + notmuch_indexopts_t *def_indexopts = NULL; const char *date; const char *from, *to, *subject; @@ -540,6 +541,11 @@ notmuch_database_index_file (notmuch_database_t *notmuch, if (is_new || is_ghost) _notmuch_message_set_header_values (message, date, from, subject); + if (!indexopts) { + def_indexopts = notmuch_database_get_default_indexopts (notmuch); + indexopts = def_indexopts; + } + ret = _notmuch_message_index_file (message, message_file); if (ret) goto DONE; @@ -557,6 +563,9 @@ notmuch_database_index_file (notmuch_database_t *notmuch, } DONE: + if (def_indexopts) + notmuch_indexopts_destroy (def_indexopts); + if (message) { if ((ret == NOTMUCH_STATUS_SUCCESS || ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) && message_ret) |