tracker r1808 - in branches/indexer-split: . src/trackerd

[mr svn gnome org]

Author: mr
Date: Tue Jul  1 12:16:06 2008
New Revision: 1808
URL: http://svn.gnome.org/viewvc/tracker?rev=1808&view=rev

Log:
	* src/trackerd/tracker-crawler.c: (crawler_finalize):
	* src/trackerd/tracker-main.c: (main): Fixed some shutdown
	warnings and turned off the debugging in the crawler.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/tracker-crawler.c
   branches/indexer-split/src/trackerd/tracker-main.c

Modified: branches/indexer-split/src/trackerd/tracker-crawler.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-crawler.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-crawler.c	Tue Jul  1 12:16:06 2008
@@ -36,7 +36,7 @@
 
 #define TRACKER_CRAWLER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerPrivate))
 
-#define TESTING
+/*#define TESTING*/
 
 #define FILE_ATTRIBUTES				\
 	G_FILE_ATTRIBUTE_STANDARD_NAME ","	\
@@ -182,8 +182,23 @@
 
 	priv = TRACKER_CRAWLER_GET_PRIVATE (object);
 
+	if (priv->idle_id) {
+		g_source_remove (priv->idle_id);
+	}
+
+	g_free (priv->current_module_name);
+
+	if (priv->ignored_file_patterns) {
+		g_list_free (priv->ignored_file_patterns);
+	}
+
+	if (priv->ignored_directory_patterns) {
+		g_list_free (priv->ignored_directory_patterns);
+	}
 
-	tracker_crawler_stop (TRACKER_CRAWLER (object));
+	if (priv->timer) {
+		g_timer_destroy (priv->timer);
+	}
 
 	if (priv->files_queue_handle_id) {
 		g_source_remove (priv->files_queue_handle_id);

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	Tue Jul  1 12:16:06 2008
@@ -858,12 +858,17 @@
 	/* Set kill timeout */
 	g_timeout_add_full (G_PRIORITY_LOW, 5000, shutdown_timeout_cb, NULL, NULL);
 
+	if (processor) {
+		g_object_unref (processor);
+	}
+
 	shutdown_indexer ();
 	shutdown_databases ();
 	shutdown_directories ();
 
 	/* Shutdown major subsystems */
 	tracker_dbus_shutdown ();
+        tracker_module_config_shutdown ();
 	tracker_xesam_manager_shutdown ();
 	tracker_db_manager_shutdown (TRUE);
 	tracker_db_shutdown ();
@@ -871,10 +876,6 @@
 	tracker_nfs_lock_shutdown ();
 	tracker_log_shutdown ();
 
-	if (processor) {
-		g_object_unref (processor);
-	}
-
 	if (tracker->language) {
 		g_object_unref (tracker->language);
 	}
@@ -883,8 +884,6 @@
                 g_object_unref (tracker->config);
         }
 
-        tracker_module_config_shutdown ();
-
 	shutdown_locations ();
 
 	return EXIT_SUCCESS;