rhythmbox r5643 - in trunk: . plugins/audioscrobbler
- From: teuf svn gnome org
- To: svn-commits-list gnome org
- Subject: rhythmbox r5643 - in trunk: . plugins/audioscrobbler
- Date: Sat, 22 Mar 2008 11:54:45 +0000 (GMT)
Author: teuf
Date: Sat Mar 22 11:54:45 2008
New Revision: 5643
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5643&view=rev
Log:
* 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'
Modified:
trunk/ChangeLog
trunk/plugins/audioscrobbler/rb-audioscrobbler.c
Modified: trunk/plugins/audioscrobbler/rb-audioscrobbler.c
==============================================================================
--- trunk/plugins/audioscrobbler/rb-audioscrobbler.c (original)
+++ trunk/plugins/audioscrobbler/rb-audioscrobbler.c Sat Mar 22 11:54:45 2008
@@ -1458,6 +1458,17 @@
/* Queue functions: */
+static char *rb_uri_decode (const char *uri)
+{
+#if defined(HAVE_LIBSOUP_2_4)
+ return soup_uri_decode (uri);
+#else
+ char *decoded;
+ decoded = g_strdup (uri);
+ soup_uri_decode (decoded);
+ return decoded;
+#endif
+}
static AudioscrobblerEntry*
rb_audioscrobbler_load_entry_from_string (const char *string)
@@ -1477,23 +1488,19 @@
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]);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]