rpms/rhythmbox/devel rhythmbox-0.11.0-bgo-442792.diff, NONE, 1.1 rhythmbox.spec, 1.118, 1.119

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23001

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.11.0-bgo-442792.diff 
Log Message:
* Mon Jun 04 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.0-5
- Add patch to not ignore tags with trailing white spaces


rhythmbox-0.11.0-bgo-442792.diff:

--- NEW FILE rhythmbox-0.11.0-bgo-442792.diff ---
diff --git a/metadata/rb-metadata-gst.c b/metadata/rb-metadata-gst.c
index 53631b2..97767cf 100644
--- a/metadata/rb-metadata-gst.c
+++ b/metadata/rb-metadata-gst.c
@@ -623,7 +623,6 @@ rb_metadata_gst_load_tag (const GstTagList *list, const gchar *tag, RBMetaData *
 		 * and then remove leading and trailing whitespace.
 		 */
 		char *str;
-		const char *old_str;
 
 		str = g_value_dup_string (newval);
 
@@ -638,15 +637,20 @@ rb_metadata_gst_load_tag (const GstTagList *list, const gchar *tag, RBMetaData *
 
 		/* Check whether we have a shorter duplicate tag,
 		 * Doesn't work with non-normalised UTF-8 strings */
-		old_str = g_value_get_string (val);
-		if (old_str != NULL
-		    && g_utf8_strlen (old_str, -1) > g_utf8_strlen (str, -1)) {
-			if (g_str_has_prefix (old_str, str) != FALSE) {
-				rb_debug ("Got shorter duplicate tag");
-				g_free (str);
-				g_value_unset (newval);
-				g_free (newval);
-				return;
+		val = g_hash_table_lookup (md->priv->metadata,
+					   GINT_TO_POINTER (field));
+		if (val != NULL) {
+			const char *old_str;
+			old_str = g_value_get_string (val);
+			if (old_str != NULL
+			    && g_utf8_strlen (old_str, -1) > g_utf8_strlen (str, -1)) {
+				if (g_str_has_prefix (old_str, str) != FALSE) {
+					rb_debug ("Got shorter duplicate tag");
+					g_free (str);
+					g_value_unset (newval);
+					g_free (newval);
+					return;
+				}
 			}
 		}
 		g_value_take_string (newval, str);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- rhythmbox.spec	29 May 2007 13:04:12 -0000	1.118
+++ rhythmbox.spec	4 Jun 2007 10:15:21 -0000	1.119
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -46,6 +46,7 @@
 
 Patch2: rhythmbox-enable-stores.patch
 Patch3: rhythmbox-trunk-shops-resizing.patch
+Patch4: rhythmbox-0.11.0-bgo-442792.diff
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -60,6 +61,7 @@
 %patch2 -p0 -b .enable-stores
 popd
 %patch3 -p0 -b .dont-resize-stores
+%patch4 -p0 -b .trailing-white-space
 
 %build
 
@@ -148,6 +150,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Mon Jun 04 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.0-5
+- Add patch to not ignore tags with trailing white spaces
+
 * Tue May 29 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.0-4
 - Update totem playlist parser requirements