lib: add --exclude=all option

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index 7381a545eda132150461f467d0b6055fb7caa8e8..1cc768f887db5736fa1ec3399e68c9af32a6253e 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -28,7 +28,7 @@ struct _notmuch_query {
     const char *query_string;
     notmuch_sort_t sort;
     notmuch_string_list_t *exclude_terms;
-    notmuch_bool_t omit_excluded;
+    notmuch_exclude_t omit_excluded;
 };
 
 typedef struct _notmuch_mset_messages {
@@ -92,7 +92,7 @@ notmuch_query_create (notmuch_database_t *notmuch,
 
     query->exclude_terms = _notmuch_string_list_create (query);
 
-    query->omit_excluded = TRUE;
+    query->omit_excluded = NOTMUCH_EXCLUDE_TRUE;
 
     return query;
 }
@@ -104,7 +104,8 @@ notmuch_query_get_query_string (notmuch_query_t *query)
 }
 
 void
-notmuch_query_set_omit_excluded (notmuch_query_t *query, notmuch_bool_t omit_excluded)
+notmuch_query_set_omit_excluded (notmuch_query_t *query,
+                                notmuch_exclude_t omit_excluded)
 {
     query->omit_excluded = omit_excluded;
 }
@@ -220,7 +221,7 @@ notmuch_query_search_messages (notmuch_query_t *query)
        if (query->exclude_terms) {
            exclude_query = _notmuch_exclude_tags (query, final_query);
 
-           if (query->omit_excluded)
+           if (query->omit_excluded != NOTMUCH_EXCLUDE_FALSE)
                final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,
                                             final_query, exclude_query);
            else {
@@ -486,6 +487,7 @@ notmuch_threads_get (notmuch_threads_t *threads)
                                   doc_id,
                                   &threads->match_set,
                                   threads->query->exclude_terms,
+                                  threads->query->omit_excluded,
                                   threads->query->sort);
 }