diff options
| author | David Bremner <david@tethera.net> | 2021-08-18 21:46:42 -0700 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-08-18 21:46:42 -0700 |
| commit | 3df2281746d57abbb45790ecb432ef40533c30bc (patch) | |
| tree | 3e595ef0946ce6aa6604863a36e3e67bbf7d3f03 /lib | |
| parent | 6fec5d771ede7998ff395abd636d391c21163409 (diff) | |
| parent | 34fec91e17629a6a095bd5930e020dfeaddff245 (diff) | |
Merge tag 'debian/0.32.3-1'
notmuch release 0.32.3-1 for unstable (sid) [dgit]
[dgit distro=debian no-split --quilt=linear]
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/notmuch.h | 6 | ||||
| -rw-r--r-- | lib/open.cc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/notmuch.h b/lib/notmuch.h index 3b28bea3..ef11ed1b 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -58,7 +58,7 @@ NOTMUCH_BEGIN_DECLS * version in Makefile.local. */ #define LIBNOTMUCH_MAJOR_VERSION 5 -#define LIBNOTMUCH_MINOR_VERSION 3 +#define LIBNOTMUCH_MINOR_VERSION 4 #define LIBNOTMUCH_MICRO_VERSION 0 @@ -316,7 +316,7 @@ typedef enum { /** * Deprecated alias for notmuch_database_open_with_config with - * config_path=error_message=NULL + * config_path="" and error_message=NULL * @deprecated Deprecated as of libnotmuch 5.4 (notmuch 0.32) */ /* NOTMUCH_DEPRECATED(5, 4) */ @@ -326,7 +326,7 @@ notmuch_database_open (const char *path, notmuch_database_t **database); /** * Deprecated alias for notmuch_database_open_with_config with - * config_path=NULL + * config_path="" * * @deprecated Deprecated as of libnotmuch 5.4 (notmuch 0.32) * diff --git a/lib/open.cc b/lib/open.cc index 7b95c5b1..280ffee3 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -221,6 +221,10 @@ _choose_database_path (void *ctx, } if (! *database_path) { + *database_path = getenv ("MAILDIR"); + } + + if (! *database_path) { notmuch_status_t status; *database_path = talloc_asprintf (ctx, "%s/mail", getenv ("HOME")); |