tracker r2686 - branches/turtle/src/trackerd

[ifrade svn gnome org]

Author: ifrade
Date: Wed Dec 10 10:41:36 2008
New Revision: 2686
URL: http://svn.gnome.org/viewvc/tracker?rev=2686&view=rev

Log:
Using private to store the turtle backup file name

Modified:
   branches/turtle/src/trackerd/tracker-main.c

Modified: branches/turtle/src/trackerd/tracker-main.c
==============================================================================
--- branches/turtle/src/trackerd/tracker-main.c	(original)
+++ branches/turtle/src/trackerd/tracker-main.c	Wed Dec 10 10:41:36 2008
@@ -96,7 +96,8 @@
 	gchar		 *data_dir;
 	gchar		 *user_data_dir;
 	gchar		 *sys_tmp_dir;
-
+	gchar            *ttl_backup_file;
+	
 	gboolean	  reindex_on_shutdown;
 
 	TrackerProcessor *processor;
@@ -182,6 +183,7 @@
 	g_free (private->user_data_dir);
 	g_free (private->data_dir);
 
+	g_free (private->ttl_backup_file);
 	g_free (private->log_filename);
 
 	g_main_loop_unref (private->main_loop);
@@ -501,6 +503,11 @@
 				  NULL);
 	g_free (filename);
 
+	private->ttl_backup_file = 
+		g_build_filename (private->user_data_dir, 
+				  "tracker-userdata-backup.ttl",
+				  NULL);
+
 	/* Private locations */
 	private->log_filename =
 		g_build_filename (g_get_user_data_dir (),
@@ -747,21 +754,14 @@
 	return FALSE;
 }
 
-static gchar *
-get_turtle_userdata_backup_filename (void) 
-{
+static const gchar *
+get_ttl_backup_filename (void) {
+
 	TrackerMainPrivate *private;
 
 	private = g_static_private_get (&private_key);
-	
-	if (private) {
-		return g_build_filename (private->user_data_dir, 
-					 "tracker-userdata-backup.ttl",
-					 NULL);
-	} else {
-		g_critical ("Directories not initialized");
-		return NULL;
-	}
+
+	return private->ttl_backup_file;
 }
 
 
@@ -774,7 +774,6 @@
 {
 	gulong *callback_id = (gulong *)user_data;
 	GError *error;
-	gchar  *turtle_file;
 	static gint counter = 0;
 	
 	counter += 1;
@@ -783,11 +782,9 @@
 		g_debug ("Uninstalling initial crawling callback");
 		g_signal_handler_disconnect (processor, *callback_id);
 
-		turtle_file = get_turtle_userdata_backup_filename ();
 		org_freedesktop_Tracker_Indexer_restore_backup (tracker_dbus_indexer_get_proxy (), 
-								turtle_file,
+								get_ttl_backup_filename (),
 								&error);
-		g_free (turtle_file);
 	} else {
 		g_debug ("%d finished signal", counter);
 	}
@@ -969,11 +966,7 @@
 
 	if (force_reindex) {
 
-		gchar              *turtle_file;
-
-		turtle_file = get_turtle_userdata_backup_filename ();
-
-		g_message ("Saving metadata in %s", turtle_file);
+		g_message ("Saving metadata in %s", get_ttl_backup_filename ());
 
 		/* Init the DB stack */
 		tracker_db_manager_init (0, &is_first_time_index, TRUE);
@@ -987,7 +980,7 @@
 		
 		tracker_data_manager_init (config, language, file_index, email_index);
 		
-		tracker_backup_save (turtle_file);
+		tracker_backup_save (get_ttl_backup_filename ());
 
 		/* Shutdown the DB stack */
 		tracker_data_manager_shutdown ();
@@ -995,8 +988,6 @@
 		tracker_db_index_manager_shutdown ();
 		tracker_db_manager_shutdown ();
 
-		g_free (turtle_file);
-
 		flags |= TRACKER_DB_MANAGER_FORCE_REINDEX;
 		index_flags |= TRACKER_DB_INDEX_MANAGER_FORCE_REINDEX;
 	}
@@ -1225,3 +1216,4 @@
 
 	private->reindex_on_shutdown = value;
 }
+