rpms/rhythmbox/devel rb-soup_encode_uri-changes.patch, NONE, 1.1 rhythmbox.spec, 1.178, 1.179

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-soup_encode_uri-changes.patch 
Log Message:
* Thu Mar 20 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.5-3
- Patch from upstream to fix URL encoding, as soup_encode_uri()
  doesn't encode in place anymore, should fix track submission
  with last.fm


rb-soup_encode_uri-changes.patch:

--- NEW FILE rb-soup_encode_uri-changes.patch ---
commit 3e9a040bd2e490aa10af9523a6a5f385801b0b9b
Author: Christophe Fergeau <christophe at anevia.com>
Date:   Wed Mar 19 09:32:50 2008 +0100

    soup_uri_decode no longer works in place with libsoup 2.4

diff --git a/ChangeLog b/ChangeLog
index 7d42c91..3deb8d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-19  Christophe Fergeau  <teuf at gnome.org>
+
+	* plugins/audioscrobbler/rb-audioscrobbler.c: with libsoup 2.4,
+	soup_uri_decode no longer works in place as it used to, this is quite
+	likely the cause for some songs being submitted as 'An%20Artist' to
+	audioscrobbler instead of 'An Artist'
+
 2008-03-18  Jonathan Matthew  <jonathan at d14n.org>
 
 	* widgets/rb-uri-dialog.c: (rb_uri_dialog_class_init):
diff --git a/plugins/audioscrobbler/rb-audioscrobbler.c b/plugins/audioscrobbler/rb-audioscrobbler.c
index 73ea7a5..24b42de 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler.c
@@ -1458,6 +1458,17 @@ void audioscrobbler_encoded_entry_free (AudioscrobblerEncodedEntry *entry)
 
 
 /* Queue functions: */
+static char *rb_uri_decode (const char *uri)
+{
+#if defined(HAVE_LIBSOUP_2_4)
+    return soup_uri_decode (uri);
+#else 
+    char *result;
+    result = g_strdup (uri);
+    soup_uri_decode (result);
+    return result;
+#endif
+}
 
 static AudioscrobblerEntry*
 rb_audioscrobbler_load_entry_from_string (const char *string)
@@ -1477,23 +1488,19 @@ rb_audioscrobbler_load_entry_from_string (const char *string)
 		if (breaks2[0] != NULL && breaks2[1] != NULL) {
 			if (g_str_has_prefix (breaks2[0], "a")) {
 				g_free (entry->artist);
-				entry->artist = g_strdup (breaks2[1]);
-				soup_uri_decode (entry->artist);
+				entry->artist = rb_uri_decode (breaks2[1]);
 			}
 			if (g_str_has_prefix (breaks2[0], "t")) {
 				g_free (entry->title);
-				entry->title = g_strdup (breaks2[1]);
-				soup_uri_decode (entry->title);
+				entry->title = rb_uri_decode (breaks2[1]);
 			}
 			if (g_str_has_prefix (breaks2[0], "b")) {
 				g_free (entry->album);
-				entry->album = g_strdup (breaks2[1]);
-				soup_uri_decode (entry->album);
+				entry->album = rb_uri_decode (breaks2[1]);
 			}
 			if (g_str_has_prefix (breaks2[0], "m")) {
 				g_free (entry->mbid);
-				entry->mbid = g_strdup (breaks2[1]);
-				soup_uri_decode (entry->mbid);
+				entry->mbid = rb_uri_decode (breaks2[1]);
 			}
 			if (g_str_has_prefix (breaks2[0], "l")) {
 				entry->length = atoi (breaks2[1]);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- rhythmbox.spec	17 Mar 2008 10:53:51 -0000	1.178
+++ rhythmbox.spec	20 Mar 2008 17:44:05 -0000	1.179
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -54,6 +54,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=499208
 Patch1: rhythmbox-0.11.3-force-python-thread-init.patch
 Patch2: rhythmbox-0.11.4-source-unref-crasher.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=509701#c33
+Patch3: rb-soup_encode_uri-changes.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -85,6 +87,7 @@
 %patch0 -p0 -b .dont-disable-suspend
 %patch1 -p1 -b .python-threading
 %patch2 -p0 -b .source-unref-crasher
+%patch3 -p1 -b .soup-2.4
 
 %build
 # work around a gstreamer bug
@@ -198,6 +201,11 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Thu Mar 20 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.5-3
+- Patch from upstream to fix URL encoding, as soup_encode_uri()
+  doesn't encode in place anymore, should fix track submission
+  with last.fm
+
 * Mon Mar 17 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.5-2
 - Fix possible crasher in playlist activation