Index: tracker-indexer.c
===================================================================
--- tracker-indexer.c	(revision 537)
+++ tracker-indexer.c	(working copy)
@@ -49,7 +49,7 @@
 };
 
 
-static gboolean shutdown;
+static gboolean tracker_shutdown;
 
 static inline guint16
 get_score (WordDetails *details)
@@ -213,7 +213,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);
@@ -272,7 +272,7 @@
 {
 	g_return_if_fail (indexer);
 
-	shutdown = TRUE;
+	tracker_shutdown = TRUE;
 
 	g_mutex_lock (indexer->word_mutex);
 	if (!crclose (indexer->word_index)) {
@@ -289,7 +289,7 @@
 void
 tracker_indexer_sync (Indexer *indexer)
 {
-	if (shutdown) return;
+	if (tracker_shutdown) return;
 
 	g_mutex_lock (indexer->word_mutex);
 	crsync (indexer->word_index);
@@ -300,7 +300,7 @@
 tracker_indexer_optimize (Indexer *indexer)
 {
 
-	if (shutdown) return FALSE;
+	if (tracker_shutdown) return FALSE;
 
 	int num, b_count;
 
@@ -343,7 +343,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);
 
@@ -369,7 +369,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);
 
@@ -400,7 +400,7 @@
 	int  tsiz;
 	char *tmp;
 
-	if (shutdown) return FALSE;
+	if (tracker_shutdown) return FALSE;
 
 	g_return_val_if_fail ((indexer && word), FALSE);
 
@@ -495,7 +495,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);
 
@@ -601,7 +601,7 @@
 	char *tmp;
 	GHashTable *result;
 
-	if (shutdown) return NULL;
+	if (tracker_shutdown) return NULL;
 
 	result = g_hash_table_new (NULL, NULL);
 
@@ -686,7 +686,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;
@@ -786,7 +786,7 @@
 	SearchWord search_word[6];
 
 	
-	if (shutdown) return NULL;
+	if (tracker_shutdown) return NULL;
 	
 	*total_count = 0;
 
@@ -877,7 +877,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: trackerd.c
===================================================================
--- trackerd.c	(revision 537)
+++ trackerd.c	(working copy)
@@ -71,7 +71,7 @@
 DBConnection	       *main_thread_db_con;
 DBConnection	       *main_thread_cache_con;
 
-static gboolean	       shutdown;
+static gboolean	       tracker_shutdown;
 static DBusConnection  *main_connection;
 
 
@@ -236,7 +236,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 +815,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 +911,7 @@
 				
 
 				/* determine if wake up call is new stuff or a shutdown signal */
-				if (!shutdown) {
+				if (!tracker_shutdown) {
 					
 				} else {
 					break;
@@ -1202,7 +1202,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 +1219,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;
@@ -1887,7 +1887,7 @@
 
 	need_setup = FALSE;
 
-	shutdown = FALSE;
+	tracker_shutdown = FALSE;
 
 	tracker = g_new (Tracker, 1);