diff options
| author | David Bremner <david@tethera.net> | 2021-12-04 09:27:30 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-12-04 09:27:30 -0400 |
| commit | 1e7d33961e626488b09b56c8543e8edf00648670 (patch) | |
| tree | 20c45ab5912db85b2aefd399c31b5318356ebf43 /lib/open.cc | |
| parent | 20b2ae12183a5be79d2f3d8da7943bc358e8202c (diff) | |
| parent | d7f95724132bf658fd151630185899737e2ed829 (diff) | |
Merge branch 'release'
Diffstat (limited to 'lib/open.cc')
| -rw-r--r-- | lib/open.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/open.cc b/lib/open.cc index 46a01545..c2cb2818 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -246,7 +246,7 @@ _choose_database_path (void *ctx, } static notmuch_database_t * -_alloc_notmuch () +_alloc_notmuch (const char *database_path, const char *config_path, const char *profile) { notmuch_database_t *notmuch; @@ -262,6 +262,15 @@ _alloc_notmuch () notmuch->transaction_count = 0; notmuch->transaction_threshold = 0; notmuch->view = 1; + + notmuch->params = NOTMUCH_PARAM_NONE; + if (database_path) + notmuch->params |= NOTMUCH_PARAM_DATABASE; + if (config_path) + notmuch->params |= NOTMUCH_PARAM_CONFIG; + if (profile) + notmuch->params |= NOTMUCH_PARAM_PROFILE; + return notmuch; } @@ -509,7 +518,7 @@ notmuch_database_open_with_config (const char *database_path, _notmuch_init (); - notmuch = _alloc_notmuch (); + notmuch = _alloc_notmuch (database_path, config_path, profile); if (! notmuch) { status = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; @@ -609,7 +618,7 @@ notmuch_database_create_with_config (const char *database_path, _notmuch_init (); - notmuch = _alloc_notmuch (); + notmuch = _alloc_notmuch (database_path, config_path, profile); if (! notmuch) { status = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; @@ -811,7 +820,7 @@ notmuch_database_load_config (const char *database_path, _notmuch_init (); - notmuch = _alloc_notmuch (); + notmuch = _alloc_notmuch (database_path, config_path, profile); if (! notmuch) { status = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; |