tracker r2988 - in trunk: . src/trackerd

[carlosg svn gnome org]

Author: carlosg
Date: Fri Feb 27 11:52:56 2009
New Revision: 2988
URL: http://svn.gnome.org/viewvc/tracker?rev=2988&view=rev

Log:
2009-02-27  Carlos Garnacho  <carlos imendio com>

        * src/trackerd/tracker-main.c (shutdown_indexer) (main): Do not
        explicitly shutdown the indexer, it will shutdown by itself then
        trackerd disappears from the session bus, and it could respawn a
        indexer instance if it wasn't there.

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	Fri Feb 27 11:52:56 2009
@@ -632,12 +632,6 @@
 	return TRUE;
 }
 
-
-static void
-shutdown_indexer (void)
-{
-}
-
 static void
 shutdown_databases (void)
 {
@@ -1151,15 +1145,6 @@
 
 	g_timeout_add_full (G_PRIORITY_LOW, 5000, shutdown_timeout_cb, NULL, NULL);
 
-	g_message ("Waiting for indexer to finish");
-	org_freedesktop_Tracker_Indexer_shutdown (tracker_dbus_indexer_get_proxy (), &error);
-
-	if (error) {
-		g_message ("Could not shutdown the indexer, %s", error->message);
-		g_message ("Continuing anyway...");
-		g_error_free (error);
-	}
-
 	g_message ("Cleaning up");
 	if (private->processor) {
 		/* We do this instead of let the private data free
@@ -1170,7 +1155,6 @@
 		private->processor = NULL;
 	}
 
-	shutdown_indexer ();
 	shutdown_databases ();
 	shutdown_directories ();