[tracker/tracker-1.10] tracker-extract: Insert nmm:meteringMode as a resource

[Carlos Garnacho <carlosg src gnome org>]

commit 80ebde5356379e274de783abf37137a4924eab2b
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Jan 2 19:33:35 2017 +0100

    tracker-extract: Insert nmm:meteringMode as a resource
    
    This is not an string, but a builtin class, so it must be dealt
    with as a resource.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=776723

 src/libtracker-extract/tracker-xmp.c       |    6 +++++-
 src/tracker-extract/tracker-extract-gif.c  |    6 +++++-
 src/tracker-extract/tracker-extract-jpeg.c |    6 +++++-
 src/tracker-extract/tracker-extract-pdf.c  |    6 +++++-
 src/tracker-extract/tracker-extract-png.c  |    7 +++++--
 src/tracker-extract/tracker-extract-tiff.c |    6 +++++-
 6 files changed, 30 insertions(+), 7 deletions(-)
---
diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
index c9afd5f..bbe8e04 100644
--- a/src/libtracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -1035,7 +1035,11 @@ tracker_xmp_apply_to_resource (TrackerResource *resource,
        }
 
        if (data->metering_mode) {
-               tracker_resource_set_string (resource, "nmm:meteringMode", data->metering_mode);
+               TrackerResource *metering;
+
+               metering = tracker_resource_new (data->metering_mode);
+               tracker_resource_set_relation (resource, "nmm:meteringMode", metering);
+               g_object_unref (metering);
        }
 
        if (data->creator) {
diff --git a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c
index c660b04..71b6ad9 100644
--- a/src/tracker-extract/tracker-extract-gif.c
+++ b/src/tracker-extract/tracker-extract-gif.c
@@ -330,7 +330,11 @@ read_metadata (GifFileType          *gifFile,
        }
 
        if (xd->metering_mode) {
-               tracker_resource_set_string (metadata, "nmm:meteringMode", xd->metering_mode);
+               TrackerResource *metering;
+
+               metering = tracker_resource_new (xd->metering_mode);
+               tracker_resource_set_relation (metadata, "nmm:meteringMode", metering);
+               g_object_unref (metering);
        }
 
        keywords = g_ptr_array_new_with_free_func ((GDestroyNotify) g_free);
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index c4aab0e..8453d28 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -465,7 +465,11 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
        }
 
        if (md.metering_mode) {
-               tracker_resource_set_string(metadata, "nmm:meteringMode", md.metering_mode);
+               TrackerResource *metering;
+
+               metering = tracker_resource_new (md.metering_mode);
+               tracker_resource_set_relation (metadata, "nmm:meteringMode", metering);
+               g_object_unref (metering);
        }
 
        if (md.creator) {
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index 4755df6..b7b4df1 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -533,7 +533,11 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
                }
 
                if (xd->metering_mode) {
-                       tracker_resource_set_string (metadata, "nmm:meteringMode", xd->metering_mode);
+                       TrackerResource *metering;
+
+                       metering = tracker_resource_new (xd->metering_mode);
+                       tracker_resource_set_relation (metadata, "nmm:meteringMode", metering);
+                       g_object_unref (metering);
                }
 
                if (xd->address || xd->state || xd->country || xd->city ||
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 49d82e9..2ce8ae5 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -446,9 +446,12 @@ read_metadata (TrackerResource      *metadata,
        }
 
        if (md.metering_mode) {
-               tracker_resource_set_string (metadata, "nmm:meteringMode", md.metering_mode);
-       }
+               TrackerResource *metering;
 
+               metering = tracker_resource_new (md.metering_mode);
+               tracker_resource_set_relation (metadata, "nmm:meteringMode", metering);
+               g_object_unref (metering);
+       }
 
        if (xd->keywords) {
                tracker_keywords_parse (keywords, xd->keywords);
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index c41a724..1d55f74 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -583,7 +583,11 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
        }
 
        if (md.metering_mode) {
-               tracker_resource_set_string (metadata, "nmm:meteringMode", md.metering_mode);
+               TrackerResource *metering;
+
+               metering = tracker_resource_new (md.metering_mode);
+               tracker_resource_set_relation (metadata, "nmm:meteringMode", metering);
+               g_object_unref (metering);
        }
 
        if (md.creator) {