David Bremner <[email protected]> writes: Control: tag 868664 patch
From 1cd6779a8bfbd0e8e1e719d5ad4c7256f2059755 Mon Sep 17 00:00:00 2001 From: David Bremner <[email protected]> Date: Wed, 19 Jul 2017 07:44:59 -0300 Subject: [PATCH] fix notmuch version tests for version 5 The previous version of the test missed the major version bump --- notmuch-addrlookup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/notmuch-addrlookup.c b/notmuch-addrlookup.c index c5cf5b4..8979597 100644 --- a/notmuch-addrlookup.c +++ b/notmuch-addrlookup.c @@ -164,7 +164,7 @@ create_queries (notmuch_database_t *db, queries[1] = notmuch_query_create (db, sbuf); g_free (sbuf); -#if LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3 +#if LIBNOTMUCH_MAJOR_VERSION >= 5 || (LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3) unsigned int count = 0; unsigned int tmp; if (notmuch_query_count_messages_st (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS) @@ -230,7 +230,7 @@ run_queries (notmuch_database_t *db, const gchar **headers = (i == 1) ? headers_pass1 : headers_pass0; notmuch_messages_t *messages = NULL; -#if LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3 +#if LIBNOTMUCH_MAJOR_VERSION >= 5 || (LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3) if (notmuch_query_search_messages_st (queries[i], &messages) != NOTMUCH_STATUS_SUCCESS) continue; #else -- 2.13.2
signature.asc
Description: PGP signature
