tracker r3157 - in trunk: . src/tracker-extract

[mottela svn gnome org]

Author: mottela
Date: Tue Mar 31 14:51:15 2009
New Revision: 3157
URL: http://svn.gnome.org/viewvc/tracker?rev=3157&view=rev

Log:
Fixes a memory leak and sublocation field in iptc

Modified:
   trunk/ChangeLog
   trunk/src/tracker-extract/tracker-extract-gstreamer.c
   trunk/src/tracker-extract/tracker-iptc.c

Modified: trunk/src/tracker-extract/tracker-extract-gstreamer.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-gstreamer.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-gstreamer.c	Tue Mar 31 14:51:15 2009
@@ -657,6 +657,7 @@
 	gst_element_set_state (extractor->pipeline, GST_STATE_NULL);
 	gst_object_unref (extractor->bus);
 	gst_object_unref (GST_OBJECT (extractor->pipeline));
+	g_main_loop_unref (extractor->loop);
 	g_slice_free (MetadataExtractor, extractor);
 
 	/* Save embedded art */

Modified: trunk/src/tracker-extract/tracker-iptc.c
==============================================================================
--- trunk/src/tracker-extract/tracker-iptc.c	(original)
+++ trunk/src/tracker-extract/tracker-iptc.c	Tue Mar 31 14:51:15 2009
@@ -44,8 +44,8 @@
 
 static IptcTagType iptctags[] = {
         { 2, IPTC_TAG_KEYWORDS, "Image:Keywords", NULL },
-	{ 2, IPTC_TAG_CONTENT_LOC_NAME, "Image:Location", NULL },
-	{ 2, IPTC_TAG_SUBLOCATION, "Image:Sublocation", NULL },
+	/*	{ 2, IPTC_TAG_CONTENT_LOC_NAME, "Image:Location", NULL }, */
+	{ 2, IPTC_TAG_SUBLOCATION, "Image:Location", NULL },
         { 2, IPTC_TAG_DATE_CREATED, "Image:Date", NULL },
         { 2, IPTC_TAG_ORIGINATING_PROGRAM, "Image:Software", NULL },
         { 2, IPTC_TAG_BYLINE, "Image:Creator", NULL },