[tracker] tracker-extract-gstreamer: Don't check for GST_TAG_DEVICE_MAKE

[Martyn James Russell <mr src gnome org>]

commit f413befc7cb240feb35007a8b9ee6785a31a3096
Author: Sam Thursfield <sam thursfield codethink co uk>
Date:   Thu Aug 18 19:15:13 2011 +0100

    tracker-extract-gstreamer: Don't check for GST_TAG_DEVICE_MAKE
    
    The xmp and exif elements return GST_TAG_DEVICE_MANUFACTURER; nobody
    is using GST_TAG_DEVICE_MAKE any more.
    
    Fixes GB#656838

 src/tracker-extract/tracker-extract-gstreamer.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 5d40b71..c4311ab 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -88,10 +88,6 @@
 #define GST_TAG_FRAMERATE "framerate"
 #endif
 
-#ifndef GST_TAG_DEVICE_MAKE
-#define GST_TAG_DEVICE_MAKE "device-make"
-#endif
-
 typedef enum {
 	EXTRACT_MIME_AUDIO,
 	EXTRACT_MIME_VIDEO,
@@ -407,7 +403,7 @@ extract_metadata (MetadataExtractor      *extractor,
                   gchar                 **scount)
 {
 	const gchar *temp;
-	gchar *make = NULL, *model = NULL, *manuf = NULL;
+	gchar *model = NULL, *manuf = NULL;
 	gchar *composer = NULL, *albumname = NULL, *genre = NULL;
 	gboolean needs_audio = FALSE;
 
@@ -658,14 +654,13 @@ extract_metadata (MetadataExtractor      *extractor,
 		add_string_gst_tag (metadata, uri, "nie:comment", extractor->tagcache, GST_TAG_COMMENT);
 
 		gst_tag_list_get_string (extractor->tagcache, GST_TAG_DEVICE_MODEL, &model);
-		gst_tag_list_get_string (extractor->tagcache, GST_TAG_DEVICE_MAKE, &make);
 		gst_tag_list_get_string (extractor->tagcache, GST_TAG_DEVICE_MANUFACTURER, &manuf);
 
-		if (make || model || manuf) {
+		if (model || manuf) {
 			gchar *equip_uri;
 
 			equip_uri = tracker_sparql_escape_uri_printf ("urn:equipment:%s:%s:",
-			                                              manuf ? manuf : make ? make : "",
+			                                              manuf ? manuf : "",
 			                                              model ? model : "");
 
 			tracker_sparql_builder_insert_open (preupdate, NULL);
@@ -673,9 +668,9 @@ extract_metadata (MetadataExtractor      *extractor,
 			tracker_sparql_builder_predicate (preupdate, "a");
 			tracker_sparql_builder_object (preupdate, "nfo:Equipment");
 
-			if (make || manuf) {
+			if (manuf) {
 				tracker_sparql_builder_predicate (preupdate, "nfo:manufacturer");
-				tracker_sparql_builder_object_unvalidated (preupdate, manuf ? manuf : make);
+				tracker_sparql_builder_object_unvalidated (preupdate, manuf);
 			}
 			if (model) {
 				tracker_sparql_builder_predicate (preupdate, "nfo:model");
@@ -688,7 +683,6 @@ extract_metadata (MetadataExtractor      *extractor,
 			g_free (equip_uri);
 		}
 
-		g_free (make);
 		g_free (model);
 		g_free (manuf);