From: David Bremner <david@tethera.net>
Date: Tue, 7 Jul 2020 10:56:45 +0000 (-0300)
Subject: lib: migrate to post Xapian 1.3.4 compact support
X-Git-Tag: 0.31_rc0~162
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=a1b7cc834bf559184113c837f7511125db18a1aa

lib: migrate to post Xapian 1.3.4 compact support

The old API was deprecated in Xapian 1.3.4 and (will be) removed in 1.5.0
---

diff --git a/lib/database.cc b/lib/database.cc
index 78b5fec9..43bfac4e 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1281,11 +1281,7 @@ notmuch_database_compact (const char *path,
 
     try {
 	NotmuchCompactor compactor (status_cb, closure);
-
-	compactor.set_renumber (false);
-	compactor.add_source (xapian_path);
-	compactor.set_destdir (compact_xapian_path);
-	compactor.compact ();
+	notmuch->xapian_db->compact (compact_xapian_path, Xapian::DBCOMPACT_NO_RENUMBER, 0, compactor);
     } catch (const Xapian::Error &error) {
 	_notmuch_database_log (notmuch, "Error while compacting: %s\n", error.get_msg ().c_str ());
 	ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;