[tracker/writeback-refactor] miners/fs: Move writeback handling to be the first



commit 65ad5f3256e556e90b90ad29412d8af911cc5d1a
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Jul 11 11:37:46 2011 +0200

    miners/fs: Move writeback handling to be the first

 src/libtracker-miner/tracker-miner-fs.c |   36 +++++++++++++++++-------------
 1 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index cc6c73b..19a840b 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -2491,7 +2491,26 @@ item_queue_get_next_file (TrackerMinerFS  *fs,
 	ItemWritebackData *wdata;
 	GFile *queue_file;
 
-	/* Deleted items first */
+	/* Writeback items first */
+	wdata = g_queue_pop_head (fs->priv->items_writeback);
+	if (wdata) {
+		gboolean success = FALSE;
+
+		*file = g_object_ref (wdata->file);
+		*source_file = NULL;
+
+		trace_eq_pop_head ("WRITEBACK", wdata->file);
+
+		g_signal_emit (fs, signals[WRITEBACK_FILE], 0,
+		               wdata->file, wdata->results,
+		               &success);
+
+		item_writeback_data_free (wdata);
+
+		return QUEUE_WRITEBACK;
+	}
+
+	/* Deleted items second */
 	queue_file = g_queue_pop_head (fs->priv->items_deleted);
 	if (queue_file) {
 		*source_file = NULL;
@@ -2679,21 +2698,6 @@ item_queue_get_next_file (TrackerMinerFS  *fs,
 		return QUEUE_MOVED;
 	}
 
-	wdata = g_queue_pop_head (fs->priv->items_writeback);
-	if (wdata) {
-		*file = g_object_ref (wdata->file);
-		*source_file = NULL;
-
-		trace_eq_pop_head ("WRITEBACK", wdata->file);
-
-		g_signal_emit (fs, signals[WRITEBACK_FILE], 0,
-		               wdata->file, wdata->results);
-
-		item_writeback_data_free (wdata);
-
-		return QUEUE_WRITEBACK;
-	}
-
 	*file = NULL;
 	*source_file = NULL;
 



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