[tracker/property-changes-for-review] squash

[Philip Van Hoof <pvanhoof src gnome org>]

commit c9624b3f54012a2d9bc6076113bfa4d71890d678
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Apr 12 15:39:58 2010 +0200

    squash

 src/libtracker-data/tracker-data-manager.c |   26 +++++++++++++-------------
 src/libtracker-data/tracker-data-update.c  |    4 +++-
 2 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index cf7968d..ca30cda 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -252,7 +252,7 @@ update_property_value (const gchar     *kind,
 	}
 
 	if (error) {
-		g_critical ("Ontology change: %s", error->message);
+		g_critical ("Ontology change, %s", error->message);
 		g_clear_error (&error);
 	}
 
@@ -1550,7 +1550,7 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
 				                                    "ALTER TABLE \"%s_%s\" RENAME TO \"%s_%s_TEMP\"",
 				                                    service_name, field_name, service_name, field_name);
 				if (error) {
-					g_critical ("Ontology change: Renaming SQL table: %s", error->message);
+					g_critical ("Ontology change failed while renaming SQL table '%s'", error->message);
 					g_clear_error (&error);
 				}
 			}
@@ -1588,7 +1588,7 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
 			                                    "%s)", sql->str);
 
 			if (error) {
-				g_critical ("Creating SQL table: %s", error->message);
+				g_critical ("Creating SQL table failed: %s", error->message);
 				g_clear_error (&error);
 			}
 
@@ -1616,7 +1616,7 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
 				tracker_db_interface_execute_query (iface, &error, "%s", query);
 
 				if (error) {
-					g_critical ("Ontology change: Merging data of SQL table: %s", error->message);
+					g_critical ("Ontology change failed while merging data of SQL table '%s'", error->message);
 					g_clear_error (&error);
 				}
 
@@ -1625,7 +1625,7 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
 				                                    service_name, field_name);
 
 				if (error) {
-					g_critical ("Ontology change: Dropping SQL table: %s", error->message);
+					g_critical ("Ontology change failed while dropping SQL table '%s'", error->message);
 					g_clear_error (&error);
 				}
 
@@ -1686,7 +1686,7 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 		in_col_sql = g_string_new ("ID");
 		sel_col_sql = g_string_new ("ID");
 		if (error) {
-			g_critical ("Ontology change: Renaming SQL table: %s", error->message);
+			g_critical ("Ontology change failed while renaming SQL table '%s'", error->message);
 			g_error_free (error);
 		}
 	}
@@ -1700,7 +1700,7 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 		if (main_class) {
 			tracker_db_interface_execute_query (iface, &error, "CREATE TABLE Resource (ID INTEGER NOT NULL PRIMARY KEY, Uri Text NOT NULL, UNIQUE (Uri))");
 			if (error) {
-				g_critical ("Creating Resource SQL table: %s", error->message);
+				g_critical ("Failed creating Resource SQL table: %s", error->message);
 				g_clear_error (&error);
 			}
 			g_string_append (create_sql, ", Available INTEGER NOT NULL");
@@ -1775,7 +1775,7 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 					}
 					tracker_db_interface_execute_query (iface, &error, "%s", alter_sql->str);
 					if (error) {
-						g_critical ("Ontology change: altering SQL table: %s", error->message);
+						g_critical ("Ontology change failed while altering SQL table '%s'", error->message);
 						g_clear_error (&error);
 					}
 					g_string_free (alter_sql, TRUE);
@@ -1786,7 +1786,7 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 					                        field_name);
 					tracker_db_interface_execute_query (iface, &error, "%s", alter_sql->str);
 					if (error) {
-						g_critical ("Ontology change: altering SQL table: %s", error->message);
+						g_critical ("Ontology change failed while altering SQL table '%s'", error->message);
 						g_clear_error (&error);
 					}
 					g_string_free (alter_sql, TRUE);
@@ -1798,7 +1798,7 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 						                        field_name);
 						tracker_db_interface_execute_query (iface, &error, "%s", alter_sql->str);
 						if (error) {
-							g_critical ("Ontology change: altering SQL table: %s", error->message);
+							g_critical ("Ontology change failed while altering SQL table '%s'", error->message);
 							g_clear_error (&error);
 						}
 						g_string_free (alter_sql, TRUE);
@@ -1809,7 +1809,7 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 						                        field_name);
 						tracker_db_interface_execute_query (iface, &error, "%s", alter_sql->str);
 						if (error) {
-							g_critical ("Ontology change: altering SQL table: %s", error->message);
+							g_critical ("Ontology change failed while altering SQL table '%s'", error->message);
 							g_clear_error (&error);
 						}
 						g_string_free (alter_sql, TRUE);
@@ -1860,13 +1860,13 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 
 		tracker_db_interface_execute_query (iface, &error, "%s", query);
 		if (error) {
-			g_critical ("Ontology change: Merging SQL table data: %s", error->message);
+			g_critical ("Ontology change failed while merging SQL table data '%s'", error->message);
 			g_clear_error (&error);
 		}
 		g_free (query);
 		tracker_db_interface_execute_query (iface, &error, "DROP TABLE \"%s_TEMP\"", service_name);
 		if (error) {
-			g_critical ("Ontology change: Dropping SQL table: %s", error->message);
+			g_critical ("Ontology change failed while dropping SQL table '%s'", error->message);
 			g_error_free (error);
 		}
 	}
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 2ce8b2e..5f7f708 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -2376,7 +2376,9 @@ queue_statement (GList *queue,
 }
 
 static void
-ontology_transaction_end (GList *ontology_queue, GPtrArray *seen_classes, GPtrArray *seen_properties)
+ontology_transaction_end (GList *ontology_queue,
+                          GPtrArray *seen_classes,
+                          GPtrArray *seen_properties)
 {
 	GList *l;
 	const gchar *ontology_uri = NULL;