[tracker/libtracker-miner] Removed unused code now re-implemented



commit a5cb56f166206071480bc6ba2b1e63d1a1844558
Author: Martyn Russell <martyn imendio com>
Date:   Mon Aug 17 12:05:35 2009 +0100

    Removed unused code now re-implemented

 src/libtracker-miner/tracker-crawler.c |   12 ------------
 src/libtracker-miner/tracker-monitor.c |   24 ++----------------------
 2 files changed, 2 insertions(+), 34 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c
index e278c71..2e7ba5e 100644
--- a/src/libtracker-miner/tracker-crawler.c
+++ b/src/libtracker-miner/tracker-crawler.c
@@ -181,18 +181,6 @@ tracker_crawler_new (void)
 
 	crawler = g_object_new (TRACKER_TYPE_CRAWLER, NULL);
 
-#ifdef FIX
-	/* Set up crawl data */
-	crawler->private->ignored_directory_patterns =
-		tracker_module_config_get_ignored_directory_patterns ("files");
-	crawler->private->ignored_file_patterns =
-		tracker_module_config_get_ignored_file_patterns ("files");
-	crawler->private->index_file_patterns =
-		tracker_module_config_get_index_file_patterns ("files");
-	crawler->private->ignored_directories_with_content =
-		tracker_module_config_get_ignored_directories_with_content ("files");
-#endif
-
 	return crawler;
 }
 
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index 3070474..2b039b2 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -1307,18 +1307,14 @@ tracker_monitor_add (TrackerMonitor *monitor,
 		     GFile	    *file)
 {
 	INotifyHandle *file_monitor;
-	GSList	     *ignored_roots;
-	GSList	     *l;
-	gchar	     *path;
+	gchar *path;
 
 	g_return_val_if_fail (TRACKER_IS_MONITOR (monitor), FALSE);
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 
-#ifdef FIX
-	if (!tracker_config_get_enable_watches (monitor->private->config)) {
+	if (!monitor->private->enabled) {
 		return TRUE;
 	}
-#endif
 
 	if (!monitor->private->monitors) {
 		g_critical ("Could not add monitor, no monitors are set up");
@@ -1345,22 +1341,6 @@ tracker_monitor_add (TrackerMonitor *monitor,
 
 	path = g_file_get_path (file);
 
-#ifdef FIX
-	ignored_roots = tracker_config_get_no_watch_directory_roots (monitor->private->config);
-#else
-	ignored_roots = NULL;
-#endif
-
-	/* Check this location isn't excluded in the config */
-	for (l = ignored_roots; l; l = l->next) {
-		if (strcmp (path, l->data) == 0) {
-			g_message ("Not adding monitor for:'%s', path is in config ignore list",
-				   path);
-			g_free (path);
-			return FALSE;
-		}
-	}
-
 	/* We don't check if a file exists or not since we might want
 	 * to monitor locations which don't exist yet.
 	 *



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]