From: David Bremner <david@tethera.net>
Date: Wed, 5 Oct 2016 11:34:33 +0000 (-0300)
Subject: lib: replace deprecated xapian call 'flush()' with 'commit()'
X-Git-Tag: 0.24_rc0~104
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=7f07a3f0edd225a2d07086251d60d87d41c87ef5;hp=8a82ad716f807f8ba1e39269ad169dccd4a15ade

lib: replace deprecated xapian call 'flush()' with 'commit()'

This will make notmuch incompatible with Xapian before 1.1.0, which is
more than 6 years old this point.
---

diff --git a/lib/database.cc b/lib/database.cc
index f0bfe566..2d19f20c 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1711,7 +1711,7 @@ notmuch_database_end_atomic (notmuch_database_t *notmuch)
 	 * However, we rely on flushing to test atomicity. */
 	const char *thresh = getenv ("XAPIAN_FLUSH_THRESHOLD");
 	if (thresh && atoi (thresh) == 1)
-	    db->flush ();
+	    db->commit ();
     } catch (const Xapian::Error &error) {
 	_notmuch_database_log (notmuch, "A Xapian exception occurred committing transaction: %s.\n",
 		 error.get_msg().c_str());