tracker r2727 - in trunk: . src/trackerd

[ifrade svn gnome org]

Author: ifrade
Date: Thu Dec 18 11:38:38 2008
New Revision: 2727
URL: http://svn.gnome.org/viewvc/tracker?rev=2727&view=rev

Log:
Fixing restore backup callback

Modified:
   trunk/ChangeLog
   trunk/src/trackerd/tracker-main.c

Modified: trunk/src/trackerd/tracker-main.c
==============================================================================
--- trunk/src/trackerd/tracker-main.c	(original)
+++ trunk/src/trackerd/tracker-main.c	Thu Dec 18 11:38:38 2008
@@ -729,7 +729,7 @@
 static void
 backup_restore_on_crawling_finished (TrackerProcessor *processor)
 {
-	gulong                      restore_cb_id;
+	static gulong restore_cb_id = 0;
 
 	g_debug ("Setting callback for crawling finish detection");
 	restore_cb_id = g_signal_connect (processor, "finished", 
@@ -1153,7 +1153,7 @@
 		tracker_status_set_and_signal (TRACKER_STATUS_IDLE);
 	}
 
-	if (flags & TRACKER_DB_MANAGER_FORCE_REINDEX ||
+	if (flags & TRACKER_DB_MANAGER_FORCE_REINDEX &&
 	    g_file_test (get_ttl_backup_filename (), G_FILE_TEST_EXISTS)) {
 		backup_restore_on_crawling_finished (private->processor);
 	}