[tracker/tracker-store] Fix GPtrArray being used instead of TrackerSparqlBuild compiler warning

[Martyn James Russell <mr src gnome org>]

commit c7081a5082ad862775c5d841900871b89181f8ea
Author: Martyn Russell <martyn imendio com>
Date:   Mon Jun 29 11:51:59 2009 +0100

    Fix GPtrArray being used instead of TrackerSparqlBuild compiler warning

 src/tracker-extract/tracker-extract-xmp.c |   13 +++--
 src/tracker-extract/tracker-xmp.c         |   98 ++++++++++++++--------------
 src/tracker-extract/tracker-xmp.h         |    5 +-
 3 files changed, 61 insertions(+), 55 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-xmp.c b/src/tracker-extract/tracker-extract-xmp.c
index 2f6e391..299f60f 100644
--- a/src/tracker-extract/tracker-extract-xmp.c
+++ b/src/tracker-extract/tracker-extract-xmp.c
@@ -27,8 +27,8 @@
 #include "tracker-main.h"
 #include "tracker-xmp.h"
 
-static void extract_xmp (const gchar *filename, 
-                         TrackerSparqlBuilder   *metadata);
+static void extract_xmp (const gchar          *filename, 
+                         TrackerSparqlBuilder *metadata);
 
 static TrackerExtractData data[] = {
 	{ "application/rdf+xml", extract_xmp },
@@ -136,8 +136,8 @@ find_orig_uri (const gchar *xmp_filename)
 }
 
 static void
-extract_xmp (const gchar *uri, 
-             TrackerSparqlBuilder   *metadata)
+extract_xmp (const gchar          *uri, 
+             TrackerSparqlBuilder *metadata)
 {
 	gchar *contents;
 	gsize length;
@@ -149,7 +149,10 @@ extract_xmp (const gchar *uri,
 
 		/* If no orig file is found for the sidekick, we use the sidekick to
 		 * describe itself instead, falling back to uri */
-		tracker_read_xmp (contents, length, orig_uri ? orig_uri : uri, metadata);
+		tracker_read_xmp (contents,
+                                  length, 
+                                  orig_uri ? orig_uri : uri, 
+                                  metadata);
 
 		g_free (orig_uri);
 	}
diff --git a/src/tracker-extract/tracker-xmp.c b/src/tracker-extract/tracker-xmp.c
index e0c7d7d..60c2cf6 100644
--- a/src/tracker-extract/tracker-xmp.c
+++ b/src/tracker-extract/tracker-xmp.c
@@ -46,6 +46,18 @@
 #include <exempi/xmp.h>
 #include <exempi/xmpconsts.h>
 
+static void tracker_xmp_iter        (XmpPtr                xmp,
+				     XmpIteratorPtr        iter,
+				     const gchar          *uri,
+				     TrackerSparqlBuilder *metadata,
+				     gboolean              append);
+static void tracker_xmp_iter_simple (const gchar          *uri,
+				     TrackerSparqlBuilder *metadata,
+				     const gchar          *schema,
+				     const gchar          *path,
+				     const gchar          *value,
+				     gboolean              append);
+
 static const gchar *
 fix_metering_mode (const gchar *mode)
 {
@@ -98,27 +110,16 @@ fix_white_balance (const gchar *wb)
 	}
 }
 
-static void tracker_xmp_iter        (XmpPtr          xmp,
-				     XmpIteratorPtr  iter,
-				     const gchar    *uri,
-				     GPtrArray      *metadata,
-				     gboolean        append);
-static void tracker_xmp_iter_simple (const gchar    *uri,
-				     GPtrArray      *metadata,
-				     const gchar    *schema,
-				     const gchar    *path,
-				     const gchar    *value,
-				     gboolean        append);
-
-
-/* We have an array, now recursively iterate over it's children.  Set 'append' to true so that all values of the array are added
-   under one entry. */
-static void
-tracker_xmp_iter_array (XmpPtr       xmp,
-			const gchar *uri,
-			GPtrArray   *metadata, 
-			const gchar *schema, 
-			const gchar *path)
+/* We have an array, now recursively iterate over it's children.  Set
+ * 'append' to true so that all values of the array are added under
+ * one entry. 
+ */
+static void 
+tracker_xmp_iter_array (XmpPtr                xmp,
+			const gchar          *uri,
+			TrackerSparqlBuilder *metadata, 
+			const gchar          *schema, 
+			const gchar          *path)
 {
 	XmpIteratorPtr iter;
 
@@ -130,11 +131,11 @@ tracker_xmp_iter_array (XmpPtr       xmp,
 
 /* We have an array, now recursively iterate over it's children.  Set 'append' to false so that only one item is used. */
 static void
-tracker_xmp_iter_alt_text (XmpPtr       xmp, 
-			   const gchar *uri,
-			   GPtrArray   *metadata, 
-			   const gchar *schema, 
-			   const gchar *path)
+tracker_xmp_iter_alt_text (XmpPtr                xmp, 
+			   const gchar          *uri,
+			   TrackerSparqlBuilder *metadata, 
+			   const gchar          *schema, 
+			   const gchar          *path)
 {
 	XmpIteratorPtr iter;
 
@@ -143,16 +144,15 @@ tracker_xmp_iter_alt_text (XmpPtr       xmp,
 	xmp_iterator_free (iter);
 }
 
-
 /* We have a simple element, but need to iterate over the qualifiers */
 static void
-tracker_xmp_iter_simple_qual (XmpPtr       xmp, 
-			      const gchar *uri,
-			      GPtrArray   *metadata,
-			      const gchar *schema, 
-			      const gchar *path, 
-			      const gchar *value, 
-			      gboolean     append)
+tracker_xmp_iter_simple_qual (XmpPtr                xmp, 
+			      const gchar          *uri,
+			      TrackerSparqlBuilder *metadata,
+			      const gchar          *schema, 
+			      const gchar          *path, 
+			      const gchar          *value, 
+			      gboolean              append)
 {
 	XmpIteratorPtr iter;
 	XmpStringPtr the_path;
@@ -251,12 +251,12 @@ fix_orientation (const gchar *orientation)
  * hash table.
  */
 static void
-tracker_xmp_iter_simple (const gchar *uri,
-			 GPtrArray   *metadata,
-			 const gchar *schema, 
-			 const gchar *path, 
-			 const gchar *value, 
-			 gboolean     append)
+tracker_xmp_iter_simple (const gchar          *uri,
+			 TrackerSparqlBuilder *metadata,
+			 const gchar          *schema, 
+			 const gchar          *path, 
+			 const gchar          *value, 
+			 gboolean              append)
 {
 	gchar *name;
 	const gchar *index_;
@@ -531,11 +531,11 @@ tracker_xmp_iter_simple (const gchar *uri,
  * (simple, simple w/qualifiers, or an array) handler.
  */
 void
-tracker_xmp_iter (XmpPtr          xmp, 
-		  XmpIteratorPtr  iter, 
-		  const gchar    *uri,
-		  GPtrArray      *metadata, 
-		  gboolean        append)
+tracker_xmp_iter (XmpPtr                xmp, 
+		  XmpIteratorPtr        iter, 
+		  const gchar          *uri,
+		  TrackerSparqlBuilder *metadata, 
+		  gboolean              append)
 {
 	XmpStringPtr the_schema = xmp_string_new ();
 	XmpStringPtr the_path = xmp_string_new ();
@@ -575,10 +575,10 @@ tracker_xmp_iter (XmpPtr          xmp,
 #endif /* HAVE_EXEMPI */
 
 void
-tracker_read_xmp (const gchar *buffer, 
-		  size_t       len, 
-		  const gchar *uri,
-		  GPtrArray   *metadata)
+tracker_read_xmp (const gchar          *buffer, 
+		  size_t                len, 
+		  const gchar          *uri,
+		  TrackerSparqlBuilder *metadata)
 {
 #ifdef HAVE_EXEMPI
 	XmpPtr xmp;
diff --git a/src/tracker-extract/tracker-xmp.h b/src/tracker-extract/tracker-xmp.h
index b8e18af..fd4d7c6 100644
--- a/src/tracker-extract/tracker-xmp.h
+++ b/src/tracker-extract/tracker-xmp.h
@@ -22,6 +22,9 @@
 
 #include <glib.h>
 
-void tracker_read_xmp (const gchar *buffer, size_t len, const gchar *uri, GPtrArray *metadata);
+void tracker_read_xmp (const gchar          *buffer, 
+                       size_t                len, 
+                       const gchar          *uri,
+                       TrackerSparqlBuilder *metadata);
 
 #endif /* _TRACKER_XMP_H_ */