[tracker] Reapply change from commit 86cb747.



commit 3e6a8bee1ce0e3891a60feed4e66a9d18f8c29a2
Author: Carlos Garnacho <carlos lanedo com>
Date:   Fri Mar 5 13:18:53 2010 +0100

    Reapply change from commit 86cb747.
    
    It was accidentally gone in a conflict merge.

 src/libtracker-fts/tracker-parser.c        |    3 +++
 src/tracker-miner-fs/tracker-miner-files.c |   23 ++++-------------------
 2 files changed, 7 insertions(+), 19 deletions(-)
---
diff --git a/src/libtracker-fts/tracker-parser.c b/src/libtracker-fts/tracker-parser.c
index 84eda5a..d83874e 100644
--- a/src/libtracker-fts/tracker-parser.c
+++ b/src/libtracker-fts/tracker-parser.c
@@ -143,6 +143,7 @@ strip_word (const gchar *str,
             gint         length,
             guint32     *len)
 {
+	g_print ("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
 #ifdef HAVE_UNAC
 	gchar *s = NULL;
 
@@ -559,6 +560,8 @@ tracker_parser_process_word (TrackerParser *parser,
 	g_return_val_if_fail (parser != NULL, NULL);
 	g_return_val_if_fail (word != NULL, NULL);
 
+	g_print ("process word?\n");
+
 	str = NULL;
 	stripped_word = NULL;
 
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/tracker-miner-fs/tracker-miner-files.c
index bdd96e3..d7f4867 100644
--- a/src/tracker-miner-fs/tracker-miner-files.c
+++ b/src/tracker-miner-fs/tracker-miner-files.c
@@ -1871,24 +1871,9 @@ tracker_miner_files_monitor_directory (GFile    *file,
 		return FALSE;
 	}
 
-	/* We don't want child directories inside IndexSingleDirectories
-	 * to have a monitor added.
-	 */
-	for (l = directories_to_check; l; l = l->next) {
-		gboolean is_child = FALSE;
-		GFile *dir;
-
-		dir = g_file_new_for_path (l->data);
-		is_child = g_file_has_prefix (file, dir);
-		g_object_unref (dir);
-
-		if (is_child) {
-			return FALSE;
-		}
-	}
-
-	/* Fallback to the check directory routine, since we don't
-	 * monitor anything we don't process.
-	 */
+	/* We'll only get this signal for the directories where check_directory()
+	 * and check_directory_contents() returned TRUE, so by default we want
+	 * these directories to be indexed.
+         */
 	return TRUE;
 }



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