tracker r3028 - in trunk: . src/tracker-extract src/tracker-indexer

[carlosg svn gnome org]

Author: carlosg
Date: Fri Mar  6 16:27:13 2009
New Revision: 3028
URL: http://svn.gnome.org/viewvc/tracker?rev=3028&view=rev

Log:
2009-03-06  Carlos Garnacho  <carlos imendio com>

        * src/tracker-indexer/tracker-main.c:
        * src/tracker-extract/tracker-main.c: Initialize DBus before log
        subsystem, so a second instance being run doesn't wipe the current
        instance logs.

Modified:
   trunk/ChangeLog
   trunk/src/tracker-extract/tracker-main.c
   trunk/src/tracker-indexer/tracker-main.c

Modified: trunk/src/tracker-extract/tracker-main.c
==============================================================================
--- trunk/src/tracker-extract/tracker-main.c	(original)
+++ trunk/src/tracker-extract/tracker-main.c	Fri Mar  6 16:27:13 2009
@@ -252,6 +252,8 @@
 		tracker_config_set_verbosity (config, verbosity);
 	}
 
+	tracker_dbus_init ();
+
 	/* Initialize subsystems */
 	initialize_directories ();
 
@@ -259,7 +261,6 @@
 	g_print ("Starting log:\n  File:'%s'\n", log_filename);
 
 	tracker_thumbnailer_init (config, 0);
-	tracker_dbus_init ();
 
 	/* Make Tracker available for introspection */
 	if (!tracker_dbus_register_objects ()) {

Modified: trunk/src/tracker-indexer/tracker-main.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-main.c	(original)
+++ trunk/src/tracker-indexer/tracker-main.c	Fri Mar  6 16:27:13 2009
@@ -344,6 +344,12 @@
 	if (verbosity > -1) {
 		tracker_config_set_verbosity (config, verbosity);
 	}
+	/* Make sure we initialize DBus, this shows we are started
+	 * successfully when called upon from the daemon.
+	 */
+	if (!tracker_dbus_init ()) {
+		return EXIT_FAILURE;
+	}
 
 	filename = g_build_filename (g_get_user_data_dir (),
 				     "tracker",
@@ -354,13 +360,6 @@
 	g_print ("Starting log:\n  File:'%s'\n", filename);
 	g_free (filename);
 
-	/* Make sure we initialize DBus, this shows we are started
-	 * successfully when called upon from the daemon.
-	 */
-	if (!tracker_dbus_init ()) {
-		return EXIT_FAILURE;
-	}
-
 	sanity_check_option_values (config);
 
 	/* Initialize database manager */