Merge lp:~chipaca/libubuntuone/fix-863176 into lp:libubuntuone

[John Lenton]

Escape the url passed in to forward_on_to_url

quote the url passed in to forward_on_to_url, so u1ms links to the world store work.

[Stuart Langridge (sil)]

Works when manually applying the changes to natty and recompiling.

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-09-09 15:11:47 +0000
+++ libubuntuone/u1-music-store.c	2011-09-30 11:18:34 +0000
@@ -1425,7 +1425,7 @@
 void
 u1_music_store_load_store_link (U1MusicStore *music_store, const gchar *url)
 {
-	gchar *real_url, *oauth_consumer_token, *oauth_consumer_secret, *oauth_token, *oauth_token_secret;
+	gchar *real_url, *oauth_consumer_token, *oauth_consumer_secret, *oauth_token, *oauth_token_secret, *quoted_url;
 
 	g_return_if_fail (U1_IS_MUSIC_STORE (music_store));
 	g_return_if_fail (url != NULL);
@@ -1436,10 +1436,12 @@
 		music_store->priv->idle_cb = 0;
 	}
 
+	quoted_url = g_uri_escape_string (url, NULL, FALSE);
 	real_url = g_strdup_printf ("%s%s?forward_on_to_url=%s",
 				    music_store->priv->base_url,
 				    U1_STORE_URL,
-				    url);
+				    quoted_url);
+	g_free (quoted_url);
 
 	/* Sign the URL if we have OAuth tokens */
 	get_credentials (music_store,