emacs: Add new option notmuch-search-hide-excluded

[notmuch] / bindings / python-cffi / notmuch2 / _build.py

diff --git a/bindings/python-cffi/notmuch2/_build.py b/bindings/python-cffi/notmuch2/_build.py
index f6184b97be773ff8f885b66dc312c1dfeda889f6..65d7dcb6024cb576ffa0c887591b8d35a773d667 100644 (file)
--- a/bindings/python-cffi/notmuch2/_build.py
+++ b/bindings/python-cffi/notmuch2/_build.py
@@ -1,5 +1,5 @@
 import cffi
-
+from _notmuch_config import *
 
 ffibuilder = cffi.FFI()
 ffibuilder.set_source(
@@ -16,8 +16,8 @@ ffibuilder.set_source(
         #ERROR libnotmuch  version < 5.1 not supported
     #endif
     """,
-    include_dirs=['../../lib'],
-    library_dirs=['../../lib'],
+    include_dirs=[NOTMUCH_INCLUDE_DIR],
+    library_dirs=[NOTMUCH_LIB_DIR],
     libraries=['notmuch'],
 )
 ffibuilder.cdef(
@@ -54,6 +54,8 @@ ffibuilder.cdef(
         NOTMUCH_STATUS_NO_DATABASE,
         NOTMUCH_STATUS_DATABASE_EXISTS,
         NOTMUCH_STATUS_BAD_QUERY_SYNTAX,
+        NOTMUCH_STATUS_NO_MAIL_ROOT,
+        NOTMUCH_STATUS_CLOSED_DATABASE,
         NOTMUCH_STATUS_LAST_STATUS
     } notmuch_status_t;
     typedef enum {
@@ -96,7 +98,7 @@ ffibuilder.cdef(
     typedef struct _notmuch_string_map_iterator notmuch_message_properties_t;
     typedef struct _notmuch_directory notmuch_directory_t;
     typedef struct _notmuch_filenames notmuch_filenames_t;
-    typedef struct _notmuch_config_list notmuch_config_list_t;
+    typedef struct _notmuch_config_pairs notmuch_config_pairs_t;
     typedef struct _notmuch_indexopts notmuch_indexopts_t;
 
     const char *
@@ -324,18 +326,18 @@ ffibuilder.cdef(
     notmuch_database_set_config (notmuch_database_t *db, const char *key, const char *value);
     notmuch_status_t
     notmuch_database_get_config (notmuch_database_t *db, const char *key, char **value);
-    notmuch_status_t
-    notmuch_database_get_config_list (notmuch_database_t *db, const char *prefix, notmuch_config_list_t **out);
+    notmuch_config_pairs_t *
+    notmuch_config_get_pairs (notmuch_database_t *db, const char *prefix);
     notmuch_bool_t
-    notmuch_config_list_valid (notmuch_config_list_t *config_list);
+    notmuch_config_pairs_valid (notmuch_config_pairs_t *config_list);
     const char *
-    notmuch_config_list_key (notmuch_config_list_t *config_list);
+    notmuch_config_pairs_key (notmuch_config_pairs_t *config_list);
     const char *
-    notmuch_config_list_value (notmuch_config_list_t *config_list);
+    notmuch_config_pairs_value (notmuch_config_pairs_t *config_list);
     void
-    notmuch_config_list_move_to_next (notmuch_config_list_t *config_list);
+    notmuch_config_pairs_move_to_next (notmuch_config_pairs_t *config_list);
     void
-    notmuch_config_list_destroy (notmuch_config_list_t *config_list);
+    notmuch_config_pairs_destroy (notmuch_config_pairs_t *config_list);
     """
 )