Merge lp:~dobey/libubuntuone/just-load-already into lp:libubuntuone

[dobey]

Don't bother trying to auth u1ms urls, as we auth on checkout anyway

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

=== modified file 'libubuntuoneui/u1-music-store.c'
--- libubuntuoneui/u1-music-store.c	2012-04-05 14:09:11 +0000
+++ libubuntuoneui/u1-music-store.c	2012-04-06 16:38:18 +0000
@@ -1345,8 +1345,6 @@
 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, *quoted_url;
-
 	g_return_if_fail (U1_IS_MUSIC_STORE (music_store));
 	g_return_if_fail (url != NULL);
 
@@ -1359,31 +1357,6 @@
 	/* Stop any currently pending or active page loads first */
 	webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (music_store->priv->web_viewer));
 
-	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,
-				    quoted_url);
-	g_free (quoted_url);
-
-	/* Sign the URL if we have OAuth tokens */
-	get_credentials (music_store,
-			 &oauth_consumer_token,
-			 &oauth_consumer_secret,
-			 &oauth_token,
-			 &oauth_token_secret);
-	if (oauth_consumer_token != NULL && oauth_consumer_secret != NULL &&
-	    oauth_token != NULL && oauth_token_secret != NULL) {
-		gchar *signed_url;
-
-		signed_url = oauth_sign_url2 (real_url, NULL, OA_HMAC, "GET",
-					      oauth_consumer_token, oauth_consumer_secret,
-					      oauth_token, oauth_token_secret);
-		webkit_web_view_open (WEBKIT_WEB_VIEW (music_store->priv->web_viewer), signed_url);
-
-		g_free (signed_url);
-	} else
-		webkit_web_view_open (WEBKIT_WEB_VIEW (music_store->priv->web_viewer), real_url);
-
-	g_free (real_url);
+	webkit_web_view_open (WEBKIT_WEB_VIEW (music_store->priv->web_viewer),
+			      url);
 }