[tracker/tracker-0.10] libtracker-extract: Remove where and uri args from tracker_xmp_apply_regions()

[Martyn James Russell <mr src gnome org>]

commit 12f0cca2763998a3b2959e168a6598cffb86e95f
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Sep 7 10:08:32 2011 +0100

    libtracker-extract: Remove where and uri args from tracker_xmp_apply_regions()
    
    These were unused.
    
    Also documented the function to explain where it's used compared to
    tracker_xmp_apply().

 src/libtracker-extract/tracker-xmp.c       |   33 +++++++++++++++++++++++----
 src/libtracker-extract/tracker-xmp.h       |    2 -
 src/tracker-extract/tracker-extract-gif.c  |    2 +-
 src/tracker-extract/tracker-extract-jpeg.c |    2 +-
 src/tracker-extract/tracker-extract-pdf.c  |    2 +-
 src/tracker-extract/tracker-extract-tiff.c |    2 +-
 6 files changed, 32 insertions(+), 11 deletions(-)
---
diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
index 796011e..49c8233 100644
--- a/src/libtracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -839,6 +839,9 @@ tracker_xmp_free (TrackerXmpData *data)
  *
  * This function applies all data in @data to @metadata.
  *
+ * This function also calls tracker_xmp_apply_regions(), so there is
+ * no need to call both functions.
+ *
  * Returns: %TRUE if the @data was applied to @metadata successfully,
  * otherwise %FALSE is returned.
  *
@@ -1159,25 +1162,45 @@ tracker_xmp_apply (TrackerSparqlBuilder *preupdate,
 	}
 
         if (data->regions) {
-	        tracker_xmp_apply_regions (preupdate, metadata, graph, where, uri, data);
+	        tracker_xmp_apply_regions (preupdate, metadata, NULL, data);
         }
 
 	return TRUE;
 }
 
+/**
+ * tracker_xmp_apply_regions:
+ * @preupdate: the preupdate object to apply XMP data to.
+ * @metadata: the metadata object to apply XMP data to.
+ * @graph: the graph to apply XMP data to.
+ * @data: the data to push into @preupdate and @metadata.
+ *
+ * This function applies all regional @data to @preupdate and
+ * @metadata. Regional data exists for image formats like JPEG, PNG,
+ * etc. where parts of the image refer to areas of interest. This can
+ * be people's faces, places to focus, barcodes, etc. The regional
+ * data describes the title, height, width, X, Y and can occur
+ * multiple times in a given file.
+ *
+ * This data usually is standardized between image formats and that's
+ * what makes this function different to tracker_xmp_apply() which is
+ * useful for XMP files only.
+ *
+ * Returns: %TRUE if the @data was applied to @preupdate and @metadata
+ * successfully, otherwise %FALSE is returned.
+ *
+ * Since: 0.10.26
+ **/
 gboolean
 tracker_xmp_apply_regions (TrackerSparqlBuilder *preupdate,
                            TrackerSparqlBuilder *metadata,
                            const gchar          *graph,
-                           GString              *where,
-                           const gchar          *uri,
                            TrackerXmpData       *data)
 {
         GSList *iter;
 
         g_return_val_if_fail (TRACKER_SPARQL_IS_BUILDER (preupdate), FALSE);
-        g_return_val_if_fail (TRACKER_SPARQL_IS_BUILDER (preupdate), FALSE);
-        g_return_val_if_fail (uri != NULL, FALSE);
+        g_return_val_if_fail (TRACKER_SPARQL_IS_BUILDER (metadata), FALSE);
         g_return_val_if_fail (data != NULL, FALSE);
 
         if (!data->regions) {
diff --git a/src/libtracker-extract/tracker-xmp.h b/src/libtracker-extract/tracker-xmp.h
index 07de767..2417a5c 100644
--- a/src/libtracker-extract/tracker-xmp.h
+++ b/src/libtracker-extract/tracker-xmp.h
@@ -117,8 +117,6 @@ gboolean        tracker_xmp_apply         (TrackerSparqlBuilder *preupdate,
 gboolean        tracker_xmp_apply_regions (TrackerSparqlBuilder *preupdate,
                                            TrackerSparqlBuilder *metadata,
                                            const gchar          *graph,
-                                           GString              *where,
-                                           const gchar          *uri,
                                            TrackerXmpData       *data);
 
 #ifndef TRACKER_DISABLE_DEPRECATED
diff --git a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c
index 309edc5..96ea37c 100644
--- a/src/tracker-extract/tracker-extract-gif.c
+++ b/src/tracker-extract/tracker-extract-gif.c
@@ -351,7 +351,7 @@ read_metadata (TrackerSparqlBuilder *preupdate,
 	}
 
         if (xd->regions) {
-                tracker_xmp_apply_regions (preupdate, metadata, where, uri, xd);
+                tracker_xmp_apply_regions (preupdate, metadata, uri, xd);
         }
 
 	for (i = 0; i < keywords->len; i++) {
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index d52bdf9..dd856cf 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -419,7 +419,7 @@ extract_jpeg (const gchar          *uri,
 	}
 
         if (xd->regions) {
-	        tracker_xmp_apply_regions (preupdate, metadata, graph, where, uri, xd);
+	        tracker_xmp_apply_regions (preupdate, metadata, NULL, xd);
         }
 
 	if (id->keywords) {
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index 8574c6f..787ba72 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -577,7 +577,7 @@ extract_pdf (const gchar          *uri,
 		}
 
                 if (xd->regions) {
-	                tracker_xmp_apply_regions (preupdate, metadata, graph, NULL, uri, xd);
+	                tracker_xmp_apply_regions (preupdate, metadata, NULL, xd);
                 }
 
 		tracker_xmp_free (xd);
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index 29b1ea0..d86781f 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -480,7 +480,7 @@ extract_tiff (const gchar          *uri,
 	}
 
         if (xd->regions) {
-	        tracker_xmp_apply_regions (preupdate, metadata, graph, NULL, uri, xd);
+	        tracker_xmp_apply_regions (preupdate, metadata, NULL, xd);
         }
 
 	if (md.address || md.state || md.country || md.city ||