[tracker/miner-fs-refactor: 106/120] libtracker-miner, notifier: Check dir roots with the canonical copy in TrackerFileSystem



commit 7a4a9c6c26d69797cafc8f4b668fc2270a64d989
Author: Carlos Garnacho <carlos lanedo com>
Date:   Fri Oct 21 16:33:41 2011 +0200

    libtracker-miner, notifier: Check dir roots with the canonical copy in TrackerFileSystem

 src/libtracker-miner/tracker-file-notifier.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-file-notifier.c b/src/libtracker-miner/tracker-file-notifier.c
index 22753ee..95b4b76 100644
--- a/src/libtracker-miner/tracker-file-notifier.c
+++ b/src/libtracker-miner/tracker-file-notifier.c
@@ -140,17 +140,19 @@ crawler_check_directory_cb (TrackerCrawler *crawler,
                             gpointer        user_data)
 {
 	TrackerFileNotifierPrivate *priv;
-	GFile *root;
+	GFile *root, *canonical;
 
 	priv = TRACKER_FILE_NOTIFIER (user_data)->priv;
 
+	canonical = tracker_file_system_peek_file (priv->file_system, directory);
+	root = tracker_indexing_tree_get_root (priv->indexing_tree, directory, NULL);
+
 	/* If it's a config root itself, other than the one
 	 * currently processed, bypass it, it will be processed
 	 * when the time arrives.
 	 */
-	root = tracker_indexing_tree_get_root (priv->indexing_tree, directory, NULL);
-
-	if (root == directory &&
+	if (canonical &&
+	    root == canonical &&
 	    root != priv->pending_index_roots->data) {
 		return FALSE;
 	}
@@ -398,9 +400,11 @@ sparql_file_query_populate (TrackerFileNotifier *notifier,
 			 * currently processed, bypass it, it will be processed
 			 * when the time arrives.
 			 */
+			canonical = tracker_file_system_peek_file (priv->file_system, file);
 			root = tracker_indexing_tree_get_root (priv->indexing_tree, file, NULL);
 
-			if (root == file &&
+			if (canonical &&
+			    root == file &&
 			    root != priv->pending_index_roots->data) {
 				g_object_unref (file);
 				continue;



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