[tracker/tracker-2.1] libtracker-data: Add missing HAVE_TRACKER_FTS guards
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/tracker-2.1] libtracker-data: Add missing HAVE_TRACKER_FTS guards
- Date: Fri, 9 Nov 2018 20:43:47 +0000 (UTC)
commit 78c8bc9f5684dd3bc0f6d26ba85abfa6efc1b341
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Nov 9 21:39:31 2018 +0100
libtracker-data: Add missing HAVE_TRACKER_FTS guards
Fixes build error with -Dfts=false, and a warning that must have
been there forever.
Closes: https://gitlab.gnome.org/GNOME/tracker/issues/53
src/libtracker-data/tracker-db-interface-sqlite.c | 2 ++
src/libtracker-data/tracker-db-manager.c | 2 ++
2 files changed, 4 insertions(+)
---
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c
b/src/libtracker-data/tracker-db-interface-sqlite.c
index 08c83a872..d2bba6632 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -1580,6 +1580,7 @@ close_database (TrackerDBInterface *db_interface)
}
}
+#if HAVE_TRACKER_FTS
static gchar **
_fts_create_properties (GHashTable *properties)
{
@@ -1607,6 +1608,7 @@ _fts_create_properties (GHashTable *properties)
return (gchar **) g_ptr_array_free (cols, FALSE);
}
+#endif
void
tracker_db_interface_sqlite_fts_init (TrackerDBInterface *db_interface,
diff --git a/src/libtracker-data/tracker-db-manager.c b/src/libtracker-data/tracker-db-manager.c
index 9744481f8..ab7b497e0 100644
--- a/src/libtracker-data/tracker-db-manager.c
+++ b/src/libtracker-data/tracker-db-manager.c
@@ -1055,7 +1055,9 @@ tracker_db_manager_get_db_interface (TrackerDBManager *db_manager)
TRUE, &internal_error);
if (interface) {
+#if HAVE_TRACKER_FTS
tracker_data_manager_init_fts (interface, FALSE);
+#endif
} else {
if (g_async_queue_length_unlocked (db_manager->interfaces) == 0) {
g_critical ("Error opening database: %s", internal_error->message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]