[tracker/tracker-0.12: 17/202] libtracker-data: Fix error check for unsupported ontology change

[Martyn James Russell <mr src gnome org>]

commit 447c6bfe76f04ef4d2dc584da879a1991065f74c
Author: JÃrg Billeter <j bitron ch>
Date:   Mon Sep 12 16:53:43 2011 +0200

    libtracker-data: Fix error check for unsupported ontology change

 src/libtracker-data/tracker-data-manager.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 750f269..eecf56c 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -4019,7 +4019,9 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 					                              uri_id_map,
 					                              &ontology_error);
 
-					if (ontology_error && ontology_error->code == TRACKER_DATA_UNSUPPORTED_ONTOLOGY_CHANGE) {
+					if (g_error_matches (ontology_error,
+					                     TRACKER_DATA_ONTOLOGY_ERROR,
+					                     TRACKER_DATA_UNSUPPORTED_ONTOLOGY_CHANGE)) {
 						g_debug ("\nUnsupported ontology change, replaying journal\n");
 						g_error_free (ontology_error);
 
@@ -4122,7 +4124,9 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 				                              uri_id_map,
 				                              &ontology_error);
 
-				if (ontology_error && ontology_error->code == TRACKER_DATA_UNSUPPORTED_ONTOLOGY_CHANGE) {
+				if (g_error_matches (ontology_error,
+				                     TRACKER_DATA_ONTOLOGY_ERROR,
+				                     TRACKER_DATA_UNSUPPORTED_ONTOLOGY_CHANGE)) {
 					g_debug ("\nUnsupported ontology change, replaying journal\n");
 					g_error_free (ontology_error);
 
@@ -4231,7 +4235,9 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 				}
 			}
 
-			if (ontology_error && ontology_error->code == TRACKER_DATA_UNSUPPORTED_ONTOLOGY_CHANGE) {
+			if (g_error_matches (ontology_error,
+			                     TRACKER_DATA_ONTOLOGY_ERROR,
+			                     TRACKER_DATA_UNSUPPORTED_ONTOLOGY_CHANGE)) {
 				g_debug ("\nUnsupported ontology change, replaying journal\n");
 				g_error_free (ontology_error);