[tracker/ontology-cope-for-master: 11/11] libtracker-data, -common: Fixes after Martyn's review

[Philip Van Hoof <pvanhoof src gnome org>]

commit cff064e95bcf79f7eedbb680701e4e92f278db95
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Feb 22 15:13:52 2010 +0100

    libtracker-data, -common: Fixes after Martyn's review

 src/libtracker-common/tracker-ontology.c   |   30 ++++++++++++++--------------
 src/libtracker-data/tracker-data-manager.c |   22 ++++++++++++--------
 2 files changed, 28 insertions(+), 24 deletions(-)
---
diff --git a/src/libtracker-common/tracker-ontology.c b/src/libtracker-common/tracker-ontology.c
index 6615c70..f3f1c07 100644
--- a/src/libtracker-common/tracker-ontology.c
+++ b/src/libtracker-common/tracker-ontology.c
@@ -28,11 +28,11 @@
 
 #include "tracker-ontology.h"
 
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_ONTOLOGY, TrackerOntologyPriv))
+#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_ONTOLOGY, TrackerOntologyPrivate))
 
-typedef struct _TrackerOntologyPriv TrackerOntologyPriv;
+typedef struct _TrackerOntologyPrivate TrackerOntologyPrivate;
 
-struct _TrackerOntologyPriv {
+struct _TrackerOntologyPrivate {
 	gchar *uri;
 	time_t last_modified;
 	gboolean is_new;
@@ -90,7 +90,7 @@ tracker_ontology_class_init (TrackerOntologyClass *klass)
 	                                                       FALSE,
 	                                                       G_PARAM_READWRITE));
 
-	g_type_class_add_private (object_class, sizeof (TrackerOntologyPriv));
+	g_type_class_add_private (object_class, sizeof (TrackerOntologyPrivate));
 }
 
 static void
@@ -101,7 +101,7 @@ tracker_ontology_init (TrackerOntology *service)
 static void
 ontology_finalize (GObject *object)
 {
-	TrackerOntologyPriv *priv;
+	TrackerOntologyPrivate *priv;
 
 	priv = GET_PRIV (object);
 
@@ -116,7 +116,7 @@ ontology_get_property (GObject    *object,
                        GValue     *value,
                        GParamSpec *pspec)
 {
-	TrackerOntologyPriv *priv;
+	TrackerOntologyPrivate *priv;
 
 	priv = GET_PRIV (object);
 
@@ -142,7 +142,7 @@ ontology_set_property (GObject      *object,
                        const GValue *value,
                        GParamSpec   *pspec)
 {
-	TrackerOntologyPriv *priv;
+	TrackerOntologyPrivate *priv;
 
 	priv = GET_PRIV (object);
 
@@ -178,19 +178,19 @@ tracker_ontology_new (void)
 time_t
 tracker_ontology_get_last_modified (TrackerOntology *ontology)
 {
-	TrackerOntologyPriv *priv;
+	TrackerOntologyPrivate *priv;
 
 	g_return_val_if_fail (TRACKER_IS_ONTOLOGY (ontology), 0);
 
 	priv = GET_PRIV (ontology);
 
-	return (gint64) priv->last_modified;
+	return priv->last_modified;
 }
 
 gboolean
 tracker_ontology_get_is_new (TrackerOntology *ontology)
 {
-	TrackerOntologyPriv *priv;
+	TrackerOntologyPrivate *priv;
 
 	g_return_val_if_fail (TRACKER_IS_ONTOLOGY (ontology), FALSE);
 
@@ -204,13 +204,13 @@ void
 tracker_ontology_set_last_modified (TrackerOntology *ontology,
                                     time_t           value)
 {
-	TrackerOntologyPriv *priv;
+	TrackerOntologyPrivate *priv;
 
 	g_return_if_fail (TRACKER_IS_ONTOLOGY (ontology));
 
 	priv = GET_PRIV (ontology);
 
-	priv->last_modified = (gint64) value;
+	priv->last_modified = value;
 
 	g_object_notify (G_OBJECT (ontology), "last-modified");
 }
@@ -219,7 +219,7 @@ tracker_ontology_set_last_modified (TrackerOntology *ontology,
 const gchar *
 tracker_ontology_get_uri (TrackerOntology *ontology)
 {
-	TrackerOntologyPriv *priv;
+	TrackerOntologyPrivate *priv;
 
 	g_return_val_if_fail (TRACKER_IS_ONTOLOGY (ontology), NULL);
 
@@ -233,7 +233,7 @@ void
 tracker_ontology_set_uri (TrackerOntology *ontology,
                           const gchar    *value)
 {
-	TrackerOntologyPriv *priv;
+	TrackerOntologyPrivate *priv;
 
 	g_return_if_fail (TRACKER_IS_ONTOLOGY (ontology));
 
@@ -254,7 +254,7 @@ void
 tracker_ontology_set_is_new (TrackerOntology *ontology,
                              gboolean         value)
 {
-	TrackerOntologyPriv *priv;
+	TrackerOntologyPrivate *priv;
 
 	g_return_if_fail (TRACKER_IS_ONTOLOGY (ontology));
 
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index ce78136..7ebb972 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -394,10 +394,10 @@ static TrackerOntology*
 get_ontology_from_file (const gchar *ontology_file)
 {
 	TrackerTurtleReader *reader;
-	GError              *error = NULL;
-	GHashTable          *ontology_uris;
-	TrackerOntology     *ret = NULL;
-	gchar               *ontology_path;
+	GError *error = NULL;
+	GHashTable *ontology_uris;
+	TrackerOntology *ret = NULL;
+	gchar *ontology_path;
 
 	ontology_path = g_build_filename (ontologies_dir, ontology_file, NULL);
 
@@ -429,11 +429,10 @@ get_ontology_from_file (const gchar *ontology_file)
 				ontology = tracker_ontology_new ();
 				tracker_ontology_set_uri (ontology, subject);
 
+				/* Passes ownership */
 				g_hash_table_insert (ontology_uris,
 				                     g_strdup (subject),
-				                     g_object_ref (ontology));
-
-				g_object_unref (ontology);
+				                     ontology);
 			}
 		} else if (g_strcmp0 (predicate, NAO_LAST_MODIFIED) == 0) {
 			TrackerOntology *ontology;
@@ -446,7 +445,11 @@ get_ontology_from_file (const gchar *ontology_file)
 			}
 
 			tracker_ontology_set_last_modified (ontology, tracker_string_to_date (object, NULL));
+
+			/* This one is here because lower ontology_uris is destroyed, and
+			 * else would this one's reference also be destroyed with it */
 			ret = g_object_ref (ontology);
+
 			break;
 		}
 	}
@@ -1275,7 +1278,9 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 
 				if (is_new) {
 					g_debug ("%sAltering database for class '%s' property '%s': single value (%s)",
-					         in_alter ? "" : "\t", service_name, field_name, 
+					         in_alter ? "" : "  ", 
+					         service_name, 
+					         field_name, 
 					         in_alter ? "alter" : "create");
 				}
 
@@ -1740,7 +1745,6 @@ tracker_data_manager_init (TrackerDBManagerFlags  flags,
 				}
 
 			}
-
 			g_object_unref (ontology);
 		}