[tracker/tracker-0.10] libtracker-data: Propagate errors for ontology transactions

[Martyn James Russell <mr src gnome org>]

commit 4712dacb03641d03780f9678318a920c37c8f86c
Author: Jürg Billeter <j bitron ch>
Date:   Tue May 17 11:17:12 2011 +0200

    libtracker-data: Propagate errors for ontology transactions

 src/libtracker-data/tracker-data-manager.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index dff60f3..be14a6c 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -3637,7 +3637,11 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 			}
 		}
 
-		tracker_data_begin_ontology_transaction (NULL);
+		tracker_data_begin_ontology_transaction (&internal_error);
+		if (internal_error) {
+			g_propagate_error (error, internal_error);
+			return FALSE;
+		}
 
 		/* This is a no-op when FTS is disabled */
 		tracker_db_interface_sqlite_fts_init (iface, TRUE);
@@ -3766,7 +3770,11 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 
 		/* check ontology against database */
 
-		tracker_data_begin_ontology_transaction (NULL);
+		tracker_data_begin_ontology_transaction (&internal_error);
+		if (internal_error) {
+			g_propagate_error (error, internal_error);
+			return FALSE;
+		}
 
 		/* Get a map of tracker:Ontology v. nao:lastModified so that we can test
 		 * for all the ontology files in ontologies_dir whether the last-modified