[tracker] libtracker-data: Drop unused sql_dir variable

[JÃrg Billeter <juergbi src gnome org>]

commit 0686be877b135a44c96788fa07115067505ac797
Author: JÃrg Billeter <j bitron ch>
Date:   Tue Jun 28 10:55:49 2011 +0200

    libtracker-data: Drop unused sql_dir variable

 docs/manpages/tracker-store.1                      |    7 -------
 src/libtracker-data/tracker-db-manager.c           |   15 ---------------
 tests/libtracker-data/tracker-backup-test.c        |    1 -
 .../libtracker-data/tracker-ontology-change-test.c |    1 -
 tests/libtracker-data/tracker-ontology-test.c      |    1 -
 tests/libtracker-data/tracker-sparql-blank-test.c  |    1 -
 tests/libtracker-data/tracker-sparql-test.c        |    1 -
 tests/libtracker-fts/tracker-fts-test.c            |    1 -
 8 files changed, 0 insertions(+), 28 deletions(-)
---
diff --git a/docs/manpages/tracker-store.1 b/docs/manpages/tracker-store.1
index 2ce240a..41710d7 100644
--- a/docs/manpages/tracker-store.1
+++ b/docs/manpages/tracker-store.1
@@ -53,13 +53,6 @@ read requests can be serviced if this option is used.
 
 .SH ENVIRONMENT
 .TP
-.B TRACKER_DB_SQL_DIR
-This is the directory which tracker uses to load the .sql files from.
-These are needed on each invocation of tracker-store. If unset it will
-default to the correct place. This is used mainly for testing
-purposes.
-
-.TP
 .B TRACKER_DB_ONTOLOGIES_DIR
 This is the directory which tracker uses to load the .ontology files
 from. If unset it will default to the correct place. This is used
diff --git a/src/libtracker-data/tracker-db-manager.c b/src/libtracker-data/tracker-db-manager.c
index 583ac5d..9d5441a 100644
--- a/src/libtracker-data/tracker-db-manager.c
+++ b/src/libtracker-data/tracker-db-manager.c
@@ -153,7 +153,6 @@ static void                db_remove_locale_file                    (void);
 
 static gboolean              initialized;
 static gboolean              locations_initialized;
-static gchar                *sql_dir = NULL;
 static gchar                *data_dir = NULL;
 static gchar                *user_data_dir = NULL;
 static gchar                *sys_tmp_dir = NULL;
@@ -839,7 +838,6 @@ tracker_db_manager_init (TrackerDBManagerFlags   flags,
 	TrackerDBVersion version;
 	gchar *filename;
 	const gchar *dir;
-	const gchar *env_path;
 	gboolean need_reindex;
 	guint i;
 	int in_use_file;
@@ -880,17 +878,6 @@ tracker_db_manager_init (TrackerDBManagerFlags   flags,
 	sys_tmp_dir = g_build_filename (g_get_tmp_dir (), filename, NULL);
 	g_free (filename);
 
-	g_free (sql_dir);
-	env_path = g_getenv ("TRACKER_DB_SQL_DIR");
-
-	if (G_UNLIKELY (!env_path)) {
-		sql_dir = g_build_filename (SHAREDIR,
-		                            "tracker",
-		                            NULL);
-	} else {
-		sql_dir = g_strdup (env_path);
-	}
-
 	g_free (user_data_dir);
 	user_data_dir = g_build_filename (g_get_user_data_dir (),
 	                                  "tracker",
@@ -1252,8 +1239,6 @@ tracker_db_manager_shutdown (void)
 	user_data_dir = NULL;
 	g_free (sys_tmp_dir);
 	sys_tmp_dir = NULL;
-	g_free (sql_dir);
-	sql_dir = NULL;
 
 	if (global_iface) {
 		/* libtracker-direct */
diff --git a/tests/libtracker-data/tracker-backup-test.c b/tests/libtracker-data/tracker-backup-test.c
index 36e4888..3b3ffe8 100644
--- a/tests/libtracker-data/tracker-backup-test.c
+++ b/tests/libtracker-data/tracker-backup-test.c
@@ -222,7 +222,6 @@ main (int argc, char **argv)
 
 	g_setenv ("XDG_DATA_HOME", current_dir, TRUE);
 	g_setenv ("XDG_CACHE_HOME", current_dir, TRUE);
-	g_setenv ("TRACKER_DB_SQL_DIR", TOP_SRCDIR "/data/db/", TRUE);
 	g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE);
 
 	g_free (current_dir);
diff --git a/tests/libtracker-data/tracker-ontology-change-test.c b/tests/libtracker-data/tracker-ontology-change-test.c
index 2fd935d..a7afde1 100644
--- a/tests/libtracker-data/tracker-ontology-change-test.c
+++ b/tests/libtracker-data/tracker-ontology-change-test.c
@@ -322,7 +322,6 @@ main (int argc, char **argv)
 
 	g_setenv ("XDG_DATA_HOME", data_dir, TRUE);
 	g_setenv ("XDG_CACHE_HOME", data_dir, TRUE);
-	g_setenv ("TRACKER_DB_SQL_DIR", TOP_SRCDIR "/data/db/", TRUE);
 	g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE);
 
 	/* add test cases */
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index 8910465..e100ef5 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -289,7 +289,6 @@ main (int argc, char **argv)
 
 	g_setenv ("XDG_DATA_HOME", data_dir, TRUE);
 	g_setenv ("XDG_CACHE_HOME", data_dir, TRUE);
-	g_setenv ("TRACKER_DB_SQL_DIR", TOP_SRCDIR "/data/db/", TRUE);
 	g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE);
 
 	/* add test cases */
diff --git a/tests/libtracker-data/tracker-sparql-blank-test.c b/tests/libtracker-data/tracker-sparql-blank-test.c
index 9406684..0a6cc0a 100644
--- a/tests/libtracker-data/tracker-sparql-blank-test.c
+++ b/tests/libtracker-data/tracker-sparql-blank-test.c
@@ -136,7 +136,6 @@ main (int argc, char **argv)
 
 	g_setenv ("XDG_DATA_HOME", current_dir, TRUE);
 	g_setenv ("XDG_CACHE_HOME", current_dir, TRUE);
-	g_setenv ("TRACKER_DB_SQL_DIR", TOP_SRCDIR "/data/db/", TRUE);
 	g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE);
 
 	g_test_add_func ("/libtracker-data/sparql-blank", test_blank);
diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c
index e95f140..a86d619 100644
--- a/tests/libtracker-data/tracker-sparql-test.c
+++ b/tests/libtracker-data/tracker-sparql-test.c
@@ -337,7 +337,6 @@ main (int argc, char **argv)
 
 	g_setenv ("XDG_DATA_HOME", current_dir, TRUE);
 	g_setenv ("XDG_CACHE_HOME", current_dir, TRUE);
-	g_setenv ("TRACKER_DB_SQL_DIR", TOP_SRCDIR "/data/db/", TRUE);
 	g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE);
 
 	g_free (current_dir);
diff --git a/tests/libtracker-fts/tracker-fts-test.c b/tests/libtracker-fts/tracker-fts-test.c
index e04d1ec..717d5a8 100644
--- a/tests/libtracker-fts/tracker-fts-test.c
+++ b/tests/libtracker-fts/tracker-fts-test.c
@@ -192,7 +192,6 @@ main (int argc, char **argv)
 
 	g_setenv ("XDG_DATA_HOME", current_dir, TRUE);
 	g_setenv ("XDG_CACHE_HOME", current_dir, TRUE);
-	g_setenv ("TRACKER_DB_SQL_DIR", TOP_SRCDIR "/data/db/", TRUE);
 	g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE);
 	g_setenv ("TRACKER_FTS_STOP_WORDS", "0", TRUE);