[tracker/error-handling] Squash with previous

[Philip Van Hoof <pvanhoof src gnome org>]

commit eff0a1411abdf0063d366ff00c5a9f9ef404d89c
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Feb 9 15:35:30 2011 +0100

    Squash with previous

 src/libtracker-data/tracker-data-update.c |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 3d0e16e..3a22369 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -175,7 +175,6 @@ static void         cache_insert_value      (const gchar      *table_name,
                                              gboolean          date_time);
 static GValueArray *get_old_property_values (TrackerProperty  *property,
                                              GError          **error);
-static void         rollback_transaction    (gboolean exec_rollback);
 
 void
 tracker_data_add_commit_statement_callback (TrackerCommitCallback    callback,
@@ -2509,7 +2508,7 @@ tracker_data_commit_transaction (GError **error)
 
 	tracker_data_update_buffer_flush (&actual_error);
 	if (actual_error) {
-		rollback_transaction (TRUE);
+		tracker_data_rollback_transaction ();
 		g_propagate_error (error, actual_error);
 		return;
 	}
@@ -2518,7 +2517,7 @@ tracker_data_commit_transaction (GError **error)
 	                                         &actual_error);
 
 	if (actual_error) {
-		rollback_transaction (FALSE);
+		tracker_data_rollback_transaction ();
 		g_propagate_error (error, actual_error);
 		return;
 	}
@@ -2578,10 +2577,11 @@ tracker_data_notify_transaction (gboolean start_timer)
 	}
 }
 
-static void
-rollback_transaction (gboolean exec_rollback)
+void
+tracker_data_rollback_transaction (void)
 {
 	TrackerDBInterface *iface;
+	GError *ignorable = NULL;
 
 	g_return_if_fail (in_transaction);
 
@@ -2592,8 +2592,10 @@ rollback_transaction (gboolean exec_rollback)
 
 	tracker_data_update_buffer_clear ();
 
-	if (exec_rollback) {
-		tracker_db_interface_execute_query (iface, NULL, "ROLLBACK");
+	tracker_db_interface_execute_query (iface, &ignorable, "ROLLBACK");
+
+	if (ignorable) {
+		g_error_free (ignorable);
 	}
 
 	tracker_db_interface_execute_query (iface, NULL, "PRAGMA cache_size = %d", TRACKER_DB_CACHE_SIZE_DEFAULT);
@@ -2612,12 +2614,6 @@ rollback_transaction (gboolean exec_rollback)
 	}
 }
 
-void
-tracker_data_rollback_transaction (void)
-{
-	rollback_transaction (TRUE);
-}
-
 static GPtrArray *
 update_sparql (const gchar  *update,
                gboolean      blank,
@@ -2640,7 +2636,7 @@ update_sparql (const gchar  *update,
 	g_object_unref (sparql_query);
 
 	if (actual_error) {
-		rollback_transaction (TRUE);
+		tracker_data_rollback_transaction ();
 		g_propagate_error (error, actual_error);
 		return NULL;
 	}