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

[ifrade svn gnome org]

Author: ifrade
Date: Mon Jun  9 14:04:48 2008
New Revision: 1606
URL: http://svn.gnome.org/viewvc/tracker?rev=1606&view=rev

Log:
Fixed assert. Moved initialise_directories. Removed duplicate call to tracker_watcher_init

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

Modified: branches/indexer-split/src/trackerd/tracker-db.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db.c	Mon Jun  9 14:04:48 2008
@@ -782,7 +782,7 @@
 	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
 	g_return_val_if_fail (service != NULL, NULL);
 	g_return_val_if_fail (search_string != NULL, NULL);
-	g_return_val_if_fail (offset < 0, NULL);
+	g_return_val_if_fail (offset >= 0, NULL);
 
 	array = tracker_parser_text_into_array (search_string,
 						tracker->language,

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	Mon Jun  9 14:04:48 2008
@@ -896,8 +896,9 @@
 		return EXIT_FAILURE;
 	} 
 
+	initialise_directories (&need_index);
+
 	tracker_nfs_lock_init (tracker_config_get_nfs_locking (tracker->config));
-	tracker_watcher_init ();
 	tracker_ontology_init ();
 	tracker_db_init ();
 	tracker_db_manager_init (FALSE, data_dir, user_data_dir, sys_tmp_dir); /* Using TRUE=broken */
@@ -908,7 +909,6 @@
  	tracker->hal = tracker_hal_new ();
 #endif /* HAVE_HAL */
 
-	initialise_directories (&need_index);
 	initialise_threading ();
 
 	umask (077);