tracker r1833 - in branches/indexer-split: . src/libtracker-db src/tracker-indexer src/trackerd tests/libtracker-db

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Wed Jul  2 16:11:26 2008
New Revision: 1833
URL: http://svn.gnome.org/viewvc/tracker?rev=1833&view=rev

Log:
2008-07-02  Philip Van Hoof  <pvanhoof gnome org>

        * src/tracker-indexer/tracker-main.c
        * src/trackerd/tracker-main.c
        * src/libtracker-db/tracker-db-manager.c
        * src/libtracker-db/tracker-db-manager.h
        * tests/libtracker-db/tracker-db-manager-test-attach.c
        * tests/libtracker-db/union-performance.c
        * tests/libtracker-db/tracker-db-manager-test-unattach.c
        * tests/libtracker-db/tracker-db-manager-test-custom.c

        Removing the dir in the temp dir must always happen at startup, never
        at shutdown



Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-db/tracker-db-manager.c
   branches/indexer-split/src/libtracker-db/tracker-db-manager.h
   branches/indexer-split/src/tracker-indexer/tracker-main.c
   branches/indexer-split/src/trackerd/tracker-main.c
   branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c
   branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-custom.c
   branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-unattach.c
   branches/indexer-split/tests/libtracker-db/union-performance.c

Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.c	Wed Jul  2 16:11:26 2008
@@ -2353,7 +2353,7 @@
 }
 
 void
-tracker_db_manager_shutdown (gboolean remove_tmp) 
+tracker_db_manager_shutdown (void) 
 {
         guint i;
 
@@ -2376,12 +2376,6 @@
 	g_hash_table_unref (prepared_queries);
 	prepared_queries = NULL;
 
-	/* Remove directory in tmp */
-	if (remove_tmp) {
-		g_message ("Removing directory:'%s'", sys_tmp_dir);
-		tracker_path_remove (sys_tmp_dir);
-	}
-
 	g_free (data_dir);
 	g_free (user_data_dir);
 	g_free (sys_tmp_dir);

Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.h	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.h	Wed Jul  2 16:11:26 2008
@@ -52,7 +52,7 @@
 
 void         tracker_db_manager_init                        (TrackerDBManagerFlags  flags,
 							     gboolean              *first_time);
-void         tracker_db_manager_shutdown                    (gboolean remove_tmp);
+void         tracker_db_manager_shutdown                    (void);
 
 void         tracker_db_manager_close_all                   (void);
 

Modified: branches/indexer-split/src/tracker-indexer/tracker-main.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-main.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-main.c	Wed Jul  2 16:11:26 2008
@@ -206,7 +206,7 @@
 {
 	g_message ("Shutting down...\n");
 
-	tracker_db_manager_shutdown (FALSE);
+	tracker_db_manager_shutdown ();
         tracker_module_config_shutdown ();
 }
 

Modified: branches/indexer-split/src/trackerd/tracker-main.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-main.c	Wed Jul  2 16:11:26 2008
@@ -877,7 +877,7 @@
 	tracker_dbus_shutdown ();
         tracker_module_config_shutdown ();
 	tracker_xesam_manager_shutdown ();
-	tracker_db_manager_shutdown (TRUE);
+	tracker_db_manager_shutdown ();
 	tracker_db_shutdown ();
 	tracker_monitor_shutdown ();
 	tracker_nfs_lock_shutdown ();

Modified: branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c	(original)
+++ branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c	Wed Jul  2 16:11:26 2008
@@ -59,7 +59,7 @@
                 return ;
         }
 
-        tracker_db_manager_shutdown (must_reindex);
+        tracker_db_manager_shutdown ();
         if (must_reindex) {
                 tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
                                          &first);

Modified: branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-custom.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-custom.c	(original)
+++ branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-custom.c	Wed Jul  2 16:11:26 2008
@@ -82,7 +82,7 @@
         result = g_test_run ();
         
         /* End */
-        tracker_db_manager_shutdown (TRUE);
+        tracker_db_manager_shutdown ();
 
         return result;
 }

Modified: branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-unattach.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-unattach.c	(original)
+++ branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-unattach.c	Wed Jul  2 16:11:26 2008
@@ -104,7 +104,7 @@
         result = g_test_run ();
         
         /* End */
-        tracker_db_manager_shutdown (TRUE);
+        tracker_db_manager_shutdown ();
 
         return result;
 }

Modified: branches/indexer-split/tests/libtracker-db/union-performance.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/union-performance.c	(original)
+++ branches/indexer-split/tests/libtracker-db/union-performance.c	Wed Jul  2 16:11:26 2008
@@ -145,7 +145,7 @@
 	result = g_test_run ();
 
 	/* End */
-	tracker_db_manager_shutdown (TRUE);
+	tracker_db_manager_shutdown ();
 
 	return result;
 }