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

[mr svn gnome org]

Author: mr
Date: Mon Aug  4 10:39:21 2008
New Revision: 1990
URL: http://svn.gnome.org/viewvc/tracker?rev=1990&view=rev

Log:
	* src/trackerd/tracker-crawler.[ch]:
	* src/trackerd/tracker-processor.c: Removed TrackerHal
	dependency, it is unused in this module now.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/tracker-crawler.c
   branches/indexer-split/src/trackerd/tracker-crawler.h
   branches/indexer-split/src/trackerd/tracker-processor.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	Mon Aug  4 10:39:21 2008
@@ -216,16 +216,11 @@
 
 	g_object_unref (priv->config);
 
-	if (priv->hal) {
-		g_object_unref (priv->hal);
-	}
-
 	G_OBJECT_CLASS (tracker_crawler_parent_class)->finalize (object);
 }
 
 TrackerCrawler *
 tracker_crawler_new (TrackerConfig *config,
-		     TrackerHal    *hal,
 		     const gchar   *module_name)
 {
 	TrackerCrawler *crawler;
@@ -233,18 +228,10 @@
 	g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
 	g_return_val_if_fail (module_name != NULL, NULL);
 
-#ifdef HAVE_HAL
-	g_return_val_if_fail (TRACKER_IS_HAL (hal), NULL);
-#endif /* HAVE_HAL */
-
 	crawler = g_object_new (TRACKER_TYPE_CRAWLER, NULL);
 
 	crawler->private->config = g_object_ref (config);
 
-#ifdef HAVE_HAL
-	crawler->private->hal = g_object_ref (hal);
-#endif /* HAVE_HAL */
-
 	crawler->private->module_name = g_strdup (module_name);
 
 	/* Set up crawl data */

Modified: branches/indexer-split/src/trackerd/tracker-crawler.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-crawler.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-crawler.h	Mon Aug  4 10:39:21 2008
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include <libtracker-common/tracker-config.h>
-#include <libtracker-common/tracker-hal.h>
 
 G_BEGIN_DECLS
 
@@ -50,7 +49,6 @@
 
 GType           tracker_crawler_get_type             (void);
 TrackerCrawler *tracker_crawler_new                  (TrackerConfig  *config,
-						      TrackerHal     *hal,
 						      const gchar    *module_name);
 gboolean        tracker_crawler_start                (TrackerCrawler *crawler);
 void            tracker_crawler_stop                 (TrackerCrawler *crawler);

Modified: branches/indexer-split/src/trackerd/tracker-processor.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-processor.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-processor.c	Mon Aug  4 10:39:21 2008
@@ -1261,9 +1261,7 @@
 
 	/* Set up the crawlers now we have config and hal */
 	for (l = priv->modules; l; l = l->next) {
-		crawler = tracker_crawler_new (priv->config,
-					       priv->hal,
-					       l->data);
+		crawler = tracker_crawler_new (priv->config, l->data);
 		
 		g_signal_connect (crawler, "processing-file",
 				  G_CALLBACK (crawler_processing_file_cb),