[tracker/porting/processor-rework: 9/9] Merge branch 'master' into porting/processor-rework

[Philip Van Hoof <pvanhoof src gnome org>]

commit cf3a3290c0c7fb690700f9b0fa95e06e7817f5ad
Merge: dfed822... 7d248cf...
Author: Philip Van Hoof <philip codeminded be>
Date:   Fri Jun 12 12:13:15 2009 +0200

    Merge branch 'master' into porting/processor-rework
    
    Conflicts:
    	src/trackerd/tracker-processor.c

 data/ontologies/33-nfo.ontology                   |   14 ++
 src/libtracker-common/tracker-os-dependant-unix.c |  126 ++++++++++---
 src/tracker-extract/tracker-extract-mp3.c         |   41 ++--
 src/tracker-extract/tracker-iptc.c                |   16 ++-
 src/tracker-extract/tracker-main.c                |    4 +-
 src/trackerd/tracker-main.c                       |  204 ++++++++++++++++-----
 src/trackerd/tracker-processor.c                  |   44 ++----
 src/trackerd/tracker-processor.h                  |    8 +
 src/trackerd/tracker-status.c                     |   67 +++++---
 utils/services/data-validator.c                   |    6 +-
 10 files changed, 374 insertions(+), 156 deletions(-)
---
diff --cc src/trackerd/tracker-processor.c
index 4470858,229b07e..eb8633c
--- a/src/trackerd/tracker-processor.c
+++ b/src/trackerd/tracker-processor.c
@@@ -128,79 -107,61 +128,68 @@@ enum 
  	LAST_SIGNAL
  };
  
 -static void tracker_processor_finalize	    (GObject	      *object);
 -static void crawler_destroy_notify	    (gpointer	       data);
 -static void item_queue_destroy_notify	    (gpointer	       data);
 -static void process_module_next		    (TrackerProcessor *processor);
 -static void indexer_status_cb		    (DBusGProxy       *proxy,
 -					     gdouble	       seconds_elapsed,
 -					     const gchar      *current_module_name,
 -					     guint             items_processed,
 -					     guint	       items_indexed,
 -					     guint	       items_remaining,
 -					     gpointer	       user_data);
 -static void indexer_finished_cb		    (DBusGProxy       *proxy,
 -					     gdouble	       seconds_elapsed,
 -					     guint             items_processed,
 -					     guint	       items_indexed,
 -					     gboolean	       interrupted,
 -					     gpointer	       user_data);
 -static void monitor_item_created_cb	    (TrackerMonitor   *monitor,
 -					     const gchar      *module_name,
 -					     GFile	      *file,
 -					     gboolean	       is_directory,
 -					     gpointer	       user_data);
 -static void monitor_item_updated_cb	    (TrackerMonitor   *monitor,
 -					     const gchar      *module_name,
 -					     GFile	      *file,
 -					     gboolean	       is_directory,
 -					     gpointer	       user_data);
 -static void monitor_item_deleted_cb	    (TrackerMonitor   *monitor,
 -					     const gchar      *module_name,
 -					     GFile	      *file,
 -					     gboolean	       is_directory,
 -					     gpointer	       user_data);
 -static void monitor_item_moved_cb	    (TrackerMonitor   *monitor,
 -					     const gchar      *module_name,
 -					     GFile	      *file,
 -					     GFile	      *other_file,
 -					     gboolean	       is_directory,
 -					     gboolean          is_source_monitored,
 -					     gpointer	       user_data);
 -static void crawler_processing_file_cb	    (TrackerCrawler   *crawler,
 -					     const gchar      *module_name,
 -					     GFile	      *file,
 -					     gpointer	       user_data);
 -static void crawler_processing_directory_cb (TrackerCrawler   *crawler,
 -					     const gchar      *module_name,
 -					     GFile	      *file,
 -					     gpointer	       user_data);
 -static void crawler_finished_cb		    (TrackerCrawler   *crawler,
 -					     const gchar      *module_name,
 -					     guint	       directories_found,
 -					     guint	       directories_ignored,
 -					     guint	       files_found,
 -					     guint	       files_ignored,
 -					     gpointer	       user_data);
 +static void tracker_processor_finalize        (GObject          *object);
 +static void crawler_destroy_notify            (gpointer          data);
 +static void item_queue_destroy_notify         (gpointer          data);
 +static void process_module_next               (TrackerProcessor *processor);
 +static void process_modules_stop              (TrackerProcessor *processor);
 +static void process_device_next               (TrackerProcessor *processor);
 +static void process_devices_stop              (TrackerProcessor *processor);
 +static void process_check_completely_finished (TrackerProcessor *processor);
 +static void process_next                      (TrackerProcessor *processor);
 +static void indexer_status_cb                 (DBusGProxy       *proxy,
 +					       gdouble           seconds_elapsed,
 +					       const gchar      *current_module_name,
 +					       guint             items_processed,
 +					       guint             items_indexed,
 +					       guint             items_remaining,
 +					       gpointer          user_data);
 +static void indexer_started_cb                (DBusGProxy       *proxy,
 +					       gpointer          user_data);
 +static void indexer_finished_cb               (DBusGProxy       *proxy,
 +					       gdouble           seconds_elapsed,
 +					       guint             items_processed,
 +					       guint             items_indexed,
 +					       gboolean          interrupted,
 +					       gpointer          user_data);
 +static void monitor_item_created_cb           (TrackerMonitor   *monitor,
 +					       const gchar      *module_name,
 +					       GFile            *file,
 +					       gboolean          is_directory,
 +					       gpointer          user_data);
 +static void monitor_item_updated_cb           (TrackerMonitor   *monitor,
 +					       const gchar      *module_name,
 +					       GFile            *file,
 +					       gboolean          is_directory,
 +					       gpointer          user_data);
 +static void monitor_item_deleted_cb           (TrackerMonitor   *monitor,
 +					       const gchar      *module_name,
 +					       GFile            *file,
 +					       gboolean          is_directory,
 +					       gpointer          user_data);
 +static void monitor_item_moved_cb             (TrackerMonitor   *monitor,
 +					       const gchar      *module_name,
 +					       GFile            *file,
 +					       GFile            *other_file,
 +					       gboolean          is_directory,
 +					       gboolean          is_source_monitored,
 +					       gpointer          user_data);
 +static void crawler_processing_file_cb        (TrackerCrawler   *crawler,
 +					       const gchar      *module_name,
 +					       GFile            *file,
 +					       gpointer          user_data);
 +static void crawler_processing_directory_cb   (TrackerCrawler   *crawler,
 +					       const gchar      *module_name,
 +					       GFile            *file,
 +					       gpointer          user_data);
 +static void crawler_finished_cb               (TrackerCrawler   *crawler,
 +					       const gchar      *module_name,
 +					       guint             directories_found,
 +					       guint             directories_ignored,
 +					       guint             files_found,
 +					       guint             files_ignored,
 +					       gpointer          user_data);
  
- #ifdef HAVE_HAL
- static void mount_point_added_cb	    (TrackerStorage   *hal,
- 					     const gchar      *volume_uuid,
- 					     const gchar      *mount_point,
- 					     gpointer	       user_data);
- static void mount_point_removed_cb	    (TrackerStorage   *hal,
- 					     const gchar      *volume_uuid,
- 					     const gchar      *mount_point,
- 					     gpointer	       user_data);
- #endif /* HAVE_HAL */
- 
  static guint signals[LAST_SIGNAL] = { 0, };
  
  G_DEFINE_TYPE (TrackerProcessor, tracker_processor, G_TYPE_OBJECT)
@@@ -1782,18 -1492,18 +1764,17 @@@ normalize_mount_point (const gchar *mou
  	}
  }
  
- static void
- mount_point_added_cb (TrackerStorage  *hal,
- 		      const gchar *udi,
- 		      const gchar *mount_point,
- 		      gpointer	   user_data)
+ void
+ tracker_processor_mount_point_added (TrackerProcessor *processor,
+ 				     const gchar *udi,
+ 				     const gchar *mount_point)
  {
- 	TrackerProcessor        *processor;
  	TrackerProcessorPrivate *priv;
  	TrackerStatus	         status;
 -	GList                   *l;
  	gchar                   *mp;
  
- 	processor = user_data;
+ 	g_return_if_fail (TRACKER_IS_PROCESSOR (processor));
+ 
  	priv = processor->private;
  
  	status = tracker_status_get ();