From 69229a4228ed9b780b40cd96a783e1d687acbc54 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Fri, 12 Jul 2019 17:38:47 +0300 Subject: [PATCH] mu: remove contacts-path leftovers The contacts are now embedded in the xapian database, so we don't need the contact-path anymore. Let's remove some leftovers. --- lib/mu-store-write.cc | 3 +-- lib/mu-store.h | 2 -- lib/tests/test-mu-store.c | 8 ++++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/mu-store-write.cc b/lib/mu-store-write.cc index 50700755..c8a0f933 100644 --- a/lib/mu-store-write.cc +++ b/lib/mu-store-write.cc @@ -125,8 +125,7 @@ add_synonyms (MuStore *store) MuStore* -mu_store_new_writable (const char* xpath, const char *contacts_cache, - gboolean rebuild, GError **err) +mu_store_new_writable (const char* xpath, gboolean rebuild, GError **err) { g_return_val_if_fail (xpath, NULL); diff --git a/lib/mu-store.h b/lib/mu-store.h index 2a512ff7..ed40c22c 100644 --- a/lib/mu-store.h +++ b/lib/mu-store.h @@ -38,14 +38,12 @@ typedef struct _MuStore MuStore; * create a new writable Xapian store, a place to store documents * * @param path the path to the database - * @param ccachepath path where to cache the contacts information, or NULL * @param err to receive error info or NULL. err->code is MuError value * * @return a new MuStore object with ref count == 1, or NULL in case * of error; free with mu_store_unref */ MuStore* mu_store_new_writable (const char *xpath, - const char *ccachepath, gboolean rebuild, GError **err) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; diff --git a/lib/tests/test-mu-store.c b/lib/tests/test-mu-store.c index a315f412..bf914bc6 100644 --- a/lib/tests/test-mu-store.c +++ b/lib/tests/test-mu-store.c @@ -44,7 +44,7 @@ test_mu_store_new_destroy (void) g_assert (tmpdir); err = NULL; - store = mu_store_new_writable (tmpdir, NULL, FALSE, &err); + store = mu_store_new_writable (tmpdir, FALSE, &err); g_assert_no_error (err); g_assert (store); @@ -68,7 +68,7 @@ test_mu_store_version (void) g_assert (tmpdir); err = NULL; - store = mu_store_new_writable (tmpdir, NULL, FALSE, &err); + store = mu_store_new_writable (tmpdir, FALSE, &err); g_assert (store); mu_store_unref (store); store = mu_store_new_read_only (tmpdir, &err); @@ -95,7 +95,7 @@ test_mu_store_store_msg_and_count (void) tmpdir = test_mu_common_get_random_tmpdir(); g_assert (tmpdir); - store = mu_store_new_writable (tmpdir, NULL, FALSE, NULL); + store = mu_store_new_writable (tmpdir, FALSE, NULL); g_assert (store); g_free (tmpdir); @@ -153,7 +153,7 @@ test_mu_store_store_msg_remove_and_count (void) tmpdir = test_mu_common_get_random_tmpdir(); g_assert (tmpdir); - store = mu_store_new_writable (tmpdir, NULL, FALSE, NULL); + store = mu_store_new_writable (tmpdir, FALSE, NULL); g_assert (store); g_assert_cmpuint (0,==,mu_store_count (store, NULL));