Merge tag '0.31.4'

notmuch 0.31.4 release

diff --combined lib/notmuch-private.h
index 2f5ccd6ae0c37abdeb4520dcfe4683e437b5cba6,41aff34273da26ebc25b767929a405deb292accd..750a242c61bc9ec098fb98df0bbbe61ed59047d2
--- 1/lib/notmuch-private.h
--- 2/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@@ -31,6 -31,12 +31,12 @@@
  
  #include "notmuch.h"
  
+ #include "xutil.h"
+ #include "error_util.h"
+ #include "string-util.h"
+ #include "crypto.h"
+ #include "repair.h"
+ 
  NOTMUCH_BEGIN_DECLS
  
  #include <stdlib.h>
@@@ -47,14 -53,6 +53,6 @@@
  
  #include <talloc.h>
  
- #include "gmime-extra.h"
- 
- #include "xutil.h"
- #include "error_util.h"
- #include "string-util.h"
- #include "crypto.h"
- #include "repair.h"
- 
  #ifdef DEBUG
  # define DEBUG_DATABASE_SANITY 1
  # define DEBUG_THREADING 1
@@@ -76,7 -74,7 +74,7 @@@
  #define NOTMUCH_CLEAR_BIT(valp,  bit) \
      (_NOTMUCH_VALID_BIT (bit) ? (*(valp) &= ~(1ull << (bit))) : *(valp))
  
 -#define unused(x) x __attribute__ ((unused))
 +#define unused(x) x ## _unused __attribute__ ((unused))
  
  /* Thanks to Andrew Tridgell's (SAMBA's) talloc for this definition of
   * unlikely. The talloc source code comes to us via the GNU LGPL v. 3.
@@@ -129,22 -127,10 +127,22 @@@ typedef enum _notmuch_private_status 
      NOTMUCH_PRIVATE_STATUS_OUT_OF_MEMORY              = NOTMUCH_STATUS_OUT_OF_MEMORY,
      NOTMUCH_PRIVATE_STATUS_READ_ONLY_DATABASE         = NOTMUCH_STATUS_READ_ONLY_DATABASE,
      NOTMUCH_PRIVATE_STATUS_XAPIAN_EXCEPTION           = NOTMUCH_STATUS_XAPIAN_EXCEPTION,
 +    NOTMUCH_PRIVATE_STATUS_FILE_ERROR                 = NOTMUCH_STATUS_FILE_ERROR,
      NOTMUCH_PRIVATE_STATUS_FILE_NOT_EMAIL             = NOTMUCH_STATUS_FILE_NOT_EMAIL,
      NOTMUCH_PRIVATE_STATUS_NULL_POINTER                       = NOTMUCH_STATUS_NULL_POINTER,
      NOTMUCH_PRIVATE_STATUS_TAG_TOO_LONG                       = NOTMUCH_STATUS_TAG_TOO_LONG,
      NOTMUCH_PRIVATE_STATUS_UNBALANCED_FREEZE_THAW     = NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW,
 +    NOTMUCH_PRIVATE_STATUS_UNBALANCED_ATOMIC          = NOTMUCH_STATUS_UNBALANCED_ATOMIC,
 +    NOTMUCH_PRIVATE_STATUS_UNSUPPORTED_OPERATION      = NOTMUCH_STATUS_UNSUPPORTED_OPERATION,
 +    NOTMUCH_PRIVATE_STATUS_UPGRADE_REQUIRED           = NOTMUCH_STATUS_UPGRADE_REQUIRED,
 +    NOTMUCH_PRIVATE_STATUS_PATH_ERROR                 = NOTMUCH_STATUS_PATH_ERROR,
 +    NOTMUCH_PRIVATE_STATUS_IGNORED                    = NOTMUCH_STATUS_IGNORED,
 +    NOTMUCH_PRIVATE_STATUS_ILLEGAL_ARGUMENT           = NOTMUCH_STATUS_ILLEGAL_ARGUMENT,
 +    NOTMUCH_PRIVATE_STATUS_MALFORMED_CRYPTO_PROTOCOL          = NOTMUCH_STATUS_MALFORMED_CRYPTO_PROTOCOL,
 +    NOTMUCH_PRIVATE_STATUS_FAILED_CRYPTO_CONTEXT_CREATION     = NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION,
 +    NOTMUCH_PRIVATE_STATUS_UNKNOWN_CRYPTO_PROTOCOL            = NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL,
 +    NOTMUCH_PRIVATE_STATUS_NO_CONFIG                          = NOTMUCH_STATUS_NO_CONFIG,
 +    NOTMUCH_PRIVATE_STATUS_DATABASE_EXISTS                    = NOTMUCH_STATUS_DATABASE_EXISTS,
  
      /* Then add our own private values. */
      NOTMUCH_PRIVATE_STATUS_TERM_TOO_LONG              = NOTMUCH_STATUS_LAST_STATUS,
@@@ -650,11 -636,6 +648,11 @@@ _notmuch_string_map_append (notmuch_str
                            const char *key,
                            const char *value);
  
 +void
 +_notmuch_string_map_set (notmuch_string_map_t *map,
 +                       const char *key,
 +                       const char *value);
 +
  const char *
  _notmuch_string_map_get (notmuch_string_map_t *map, const char *key);
  
@@@ -716,19 -697,6 +714,19 @@@ struct _notmuch_indexopts 
  
  #define EMPTY_STRING(s) ((s)[0] == '\0')
  
 +/* config.cc */
 +notmuch_status_t
 +_notmuch_config_load_from_database (notmuch_database_t * db);
 +
 +notmuch_status_t
 +_notmuch_config_load_from_file (notmuch_database_t * db, GKeyFile *file);
 +
 +notmuch_status_t
 +_notmuch_config_load_defaults (notmuch_database_t * db);
 +
 +void
 +_notmuch_config_cache (notmuch_database_t *db, notmuch_config_key_t key, const char* val);
 +
  NOTMUCH_END_DECLS
  
  #ifdef __cplusplus