[tracker/tracker-store] Moved error variable into less confusing code block



commit 36d03be93945480b4eb0949339253195a2812bb8
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed May 27 14:06:38 2009 +0200

    Moved error variable into less confusing code block
---
 src/tracker-store/tracker-store.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/tracker-store/tracker-store.c b/src/tracker-store/tracker-store.c
index 428e943..5ab8b34 100644
--- a/src/tracker-store/tracker-store.c
+++ b/src/tracker-store/tracker-store.c
@@ -140,12 +140,13 @@ queue_idle_handler (gpointer user_data)
 {
 	TrackerStorePrivate *private = user_data;
 	TrackerStoreTask    *task;
-	GError              *error = NULL;
 
 	task = g_queue_peek_head (private->queue);
 	g_return_val_if_fail (task != NULL, FALSE);
 
 	if (task->type == TRACKER_STORE_TASK_TYPE_UPDATE) {
+		GError *error = NULL;
+
 		begin_batch (private);
 
 		tracker_data_update_sparql (task->data.query, &error);
@@ -159,6 +160,10 @@ queue_idle_handler (gpointer user_data)
 		if (task->callback.update_callback) {
 			task->callback.update_callback (error, task->user_data);
 		}
+
+		if (error) {
+			g_clear_error (&error);
+		}
 	} else if (task->type == TRACKER_STORE_TASK_TYPE_COMMIT) {
 		end_batch (private);
 
@@ -188,7 +193,7 @@ queue_idle_handler (gpointer user_data)
 			end_batch (private);
 
 			if (task->callback.turtle_callback) {
-				task->callback.turtle_callback (error, task->user_data);
+				task->callback.turtle_callback (NULL, task->user_data);
 			}
 		}
 
@@ -200,10 +205,6 @@ queue_idle_handler (gpointer user_data)
 		task->destroy (task->user_data);
 	}
 
-	if (error) {
-		g_clear_error (&error);
-	}
-
 	tracker_store_task_free (task);
 
 	return !g_queue_is_empty (private->queue);



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