[tracker/tracker-store] tracker-indexer: Make SparqlBuilder in ModuleMetadata accessible

[Jürg Billeter <juergbi src gnome org>]

commit 7883db6bd226d73f50de93ad7ab5dc7bbaf4ff19
Author: Jürg Billeter <j bitron ch>
Date:   Tue Jun 23 17:34:26 2009 +0200

    tracker-indexer: Make SparqlBuilder in ModuleMetadata accessible

 src/tracker-indexer/tracker-indexer.c         |    3 +-
 src/tracker-indexer/tracker-module-metadata.c |   26 +------------------------
 src/tracker-indexer/tracker-module-metadata.h |   13 +++++++----
 3 files changed, 11 insertions(+), 31 deletions(-)
---
diff --git a/src/tracker-indexer/tracker-indexer.c b/src/tracker-indexer/tracker-indexer.c
index 74cc86a..d66a0bf 100644
--- a/src/tracker-indexer/tracker-indexer.c
+++ b/src/tracker-indexer/tracker-indexer.c
@@ -1405,7 +1405,8 @@ item_process (TrackerIndexer *indexer,
 		}
 
 		if (text) {
-			tracker_module_metadata_add_take_string (metadata, uri, NIE_PLAIN_TEXT_CONTENT, text);
+			tracker_module_metadata_add_string (metadata, uri, NIE_PLAIN_TEXT_CONTENT, text);
+			g_free (text);
 		}
 
 		item_add_or_update (indexer, info, uri, metadata);
diff --git a/src/tracker-indexer/tracker-module-metadata.c b/src/tracker-indexer/tracker-module-metadata.c
index 679b023..2bae53b 100644
--- a/src/tracker-indexer/tracker-module-metadata.c
+++ b/src/tracker-indexer/tracker-module-metadata.c
@@ -26,12 +26,6 @@
 #include <libtracker-common/tracker-type-utils.h>
 #include "tracker-module-metadata-private.h"
 
-struct TrackerModuleMetadata {
-	GObject parent_instance;
-	TrackerSparqlBuilder *sparql;
-	gboolean sparql_closed;
-};
-
 struct TrackerModuleMetadataClass {
 	GObjectClass parent_class;
 };
@@ -69,25 +63,7 @@ tracker_module_metadata_finalize (GObject *object)
 	G_OBJECT_CLASS (tracker_module_metadata_parent_class)->finalize (object);
 }
 
-/**
- * tracker_module_metadata_add_take_string:
- * @metadata: A #TrackerModuleMetadata
- * @subject: The subject this metadata applies to (for example, a URI).
- * @predicate: The key to which the value will be assigned.
- * @value: Value for the metadata
- *
- * Adds a new metadata element as a string into @metadata.
- * For ontology fields that can take several values, this
- * function will allow adding several elements to the same
- * field name.
- *
- * If the function returns #TRUE, @metadata will take
- * ownership on @value, else you are responsible of
- * freeing it.
- *
- * Returns: #TRUE if the value was added successfully.
- **/
-gboolean
+static gboolean
 tracker_module_metadata_add_take_string (TrackerModuleMetadata *metadata,
 					 const gchar           *subject,
 					 const gchar           *predicate,
diff --git a/src/tracker-indexer/tracker-module-metadata.h b/src/tracker-indexer/tracker-module-metadata.h
index 2e154cb..166ebff 100644
--- a/src/tracker-indexer/tracker-module-metadata.h
+++ b/src/tracker-indexer/tracker-module-metadata.h
@@ -25,6 +25,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include <libtracker-common/tracker-sparql-builder.h>
+
 G_BEGIN_DECLS
 
 #if !defined (__TRACKER_MODULE_INSIDE__) && !defined (TRACKER_COMPILATION)
@@ -39,18 +41,19 @@ G_BEGIN_DECLS
 #define TRACKER_IS_MODULE_METADATA_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c),    TRACKER_TYPE_MODULE_METADATA))
 #define TRACKER_MODULE_METADATA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o),  TRACKER_TYPE_MODULE_METADATA, TrackerModuleMetadataClass))
 
-typedef struct TrackerModuleMetadata TrackerModuleMetadata;           /* dummy typedef */
+typedef struct TrackerModuleMetadata TrackerModuleMetadata;
 typedef struct TrackerModuleMetadataClass TrackerModuleMetadataClass; /* dummy typedef */
 
+struct TrackerModuleMetadata {
+	GObject parent_instance;
+	TrackerSparqlBuilder *sparql;
+	gboolean sparql_closed;
+};
 
 GType                  tracker_module_metadata_get_type         (void) G_GNUC_CONST;
 
 TrackerModuleMetadata *tracker_module_metadata_new              (void);
 
-gboolean               tracker_module_metadata_add_take_string  (TrackerModuleMetadata *metadata,
-								 const gchar           *subject,
-								 const gchar           *predicate,
-								 gchar                 *value);
 void                   tracker_module_metadata_add_string       (TrackerModuleMetadata *metadata,
 								 const gchar           *subject,
 								 const gchar           *predicate,