Index: src/trackerd/tracker-indexer.c
===================================================================
--- src/trackerd/tracker-indexer.c	(revision 540)
+++ src/trackerd/tracker-indexer.c	(working copy)
@@ -51,7 +51,7 @@
 };
 
 
-static gboolean shutdown;
+static gboolean tracker_shutdown;
 
 static inline guint16
 get_score (WordDetails *details)
@@ -215,7 +215,7 @@
 	CURIA *word_index;
 	Indexer *result;
 
-	shutdown = FALSE;
+	tracker_shutdown = FALSE;
 
 	base_dir = g_build_filename (g_get_home_dir(), ".Tracker", "databases",  NULL);
 	word_dir = g_build_filename (base_dir, name, NULL);
@@ -274,7 +274,7 @@
 {
 	g_return_if_fail (indexer);
 
-	shutdown = TRUE;
+	tracker_shutdown = TRUE;
 
 	g_mutex_lock (indexer->word_mutex);
 	if (!crclose (indexer->word_index)) {
@@ -291,7 +291,7 @@
 void
 tracker_indexer_sync (Indexer *indexer)
 {
-	if (shutdown) return;
+	if (tracker_shutdown) return;
 
 	g_mutex_lock (indexer->word_mutex);
 	crsync (indexer->word_index);
@@ -302,7 +302,7 @@
 tracker_indexer_optimize (Indexer *indexer)
 {
 
-	if (shutdown) return FALSE;
+	if (tracker_shutdown) return FALSE;
 
 	int num, b_count;
 
@@ -345,7 +345,7 @@
 gboolean
 tracker_indexer_append_word_chunk (Indexer *indexer, const char *word, WordDetails *details, int word_detail_count)
 {
-	if (shutdown) return FALSE;
+	if (tracker_shutdown) return FALSE;
 
 	g_return_val_if_fail ((indexer && word && details && (word_detail_count > 0)), FALSE);
 
@@ -371,7 +371,7 @@
 tracker_indexer_append_word (Indexer *indexer, const char *word, guint32 id, int service, int score)
 {
 
-	if (shutdown) return FALSE;
+	if (tracker_shutdown) return FALSE;
 
 	g_return_val_if_fail ((indexer && word), FALSE);
 
@@ -402,7 +402,7 @@
 	int  tsiz;
 	char *tmp;
 
-	if (shutdown) return FALSE;
+	if (tracker_shutdown) return FALSE;
 
 	g_return_val_if_fail ((indexer && word), FALSE);
 
@@ -497,7 +497,7 @@
 	GSList *result;
 	gboolean single_search_complete;
 	
-	if (shutdown) return NULL;
+	if (tracker_shutdown) return NULL;
 
 	tracker_log ("searching for %s with smin %d and smax %d, offset %d and limit %d", word, service_type_min, service_type_max, offset, limit);
 
@@ -603,7 +603,7 @@
 	char *tmp;
 	GHashTable *result;
 
-	if (shutdown) return NULL;
+	if (tracker_shutdown) return NULL;
 
 	result = g_hash_table_new (NULL, NULL);
 
@@ -688,7 +688,7 @@
 	*hit_count = 0;
 	list = NULL;
 
-	if (shutdown) return NULL;
+	if (tracker_shutdown) return NULL;
 
 	if (!match_table || g_hash_table_size (match_table) < 1) {
 		return NULL;
@@ -788,7 +788,7 @@
 	SearchWord search_word[6];
 
 	
-	if (shutdown) return NULL;
+	if (tracker_shutdown) return NULL;
 	
 	*total_count = 0;
 
@@ -879,7 +879,7 @@
 	int service_type_min = 0;
 	int service_type_max = 255;
 
-	if (shutdown) return NULL;
+	if (tracker_shutdown) return NULL;
 	
 	g_return_val_if_fail ((indexer), NULL);
 
Index: src/trackerd/trackerd.c
===================================================================
--- src/trackerd/trackerd.c	(revision 540)
+++ src/trackerd/trackerd.c	(working copy)
@@ -71,7 +79,7 @@
 DBConnection	       *main_thread_db_con;
 DBConnection	       *main_thread_cache_con;
 
-static gboolean	       shutdown;
+static gboolean	       tracker_shutdown;
 static DBusConnection  *main_connection;
 
 
@@ -236,7 +246,7 @@
 
 	/* send signals to each thread to wake them up and then stop them */
 
-	shutdown = TRUE;
+	tracker_shutdown = TRUE;
 
 	
 	g_mutex_lock (tracker->request_signal_mutex);
@@ -815,7 +841,7 @@
 			g_cond_wait (tracker->file_thread_signal, tracker->files_signal_mutex);
 
 			/* determine if wake up call is new stuff or a shutdown signal */
-			if (!shutdown) {
+			if (!tracker_shutdown) {
 				continue;
 			} else {
 				break;
@@ -911,7 +937,7 @@
 				
 
 				/* determine if wake up call is new stuff or a shutdown signal */
-				if (!shutdown) {
+				if (!tracker_shutdown) {
 					
 				} else {
 					break;
@@ -1202,7 +1232,7 @@
 			g_cond_wait (tracker->request_thread_signal, tracker->request_signal_mutex);
 
 			/* determine if wake up call is new stuff or a shutdown signal */
-			if (!shutdown) {
+			if (!tracker_shutdown) {
 				continue;
 			} else {
 				break;
@@ -1219,7 +1249,7 @@
 			g_mutex_unlock (tracker->request_check_mutex);
 
 			/* determine if wake up call is new stuff or a shutdown signal */
-			if (!shutdown) {
+			if (!tracker_shutdown) {
 				continue;
 			} else {
 				break;
@@ -1890,7 +1924,7 @@
 
 	need_setup = FALSE;
 
-	shutdown = FALSE;
+	tracker_shutdown = FALSE;
 
 	tracker = g_new (Tracker, 1);