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

Proposed by dobey on 2012-04-06
Status: Merged
Approved by: Brian Curtin on 2012-04-06
Approved revision: 151
Merged at revision: 151
Proposed branch: lp:~dobey/libubuntuone/just-load-already
Merge into: lp:libubuntuone
Diff against target: 46 lines (+2/-29)
1 file modified
libubuntuoneui/u1-music-store.c (+2/-29)
To merge this branch: bzr merge lp:~dobey/libubuntuone/just-load-already
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve on 2012-04-06
Diego Sarmentero (community) 2012-04-06 Approve on 2012-04-06
Review via email: mp+101131@code.launchpad.net

Commit message

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

To post a comment you must log in.
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libubuntuoneui/u1-music-store.c'
2--- libubuntuoneui/u1-music-store.c 2012-04-05 14:09:11 +0000
3+++ libubuntuoneui/u1-music-store.c 2012-04-06 16:38:18 +0000
4@@ -1345,8 +1345,6 @@
5 void
6 u1_music_store_load_store_link (U1MusicStore *music_store, const gchar *url)
7 {
8- gchar *real_url, *oauth_consumer_token, *oauth_consumer_secret, *oauth_token, *oauth_token_secret, *quoted_url;
9-
10 g_return_if_fail (U1_IS_MUSIC_STORE (music_store));
11 g_return_if_fail (url != NULL);
12
13@@ -1359,31 +1357,6 @@
14 /* Stop any currently pending or active page loads first */
15 webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (music_store->priv->web_viewer));
16
17- quoted_url = g_uri_escape_string (url, NULL, FALSE);
18- real_url = g_strdup_printf ("%s%s?forward_on_to_url=%s",
19- music_store->priv->base_url,
20- U1_STORE_URL,
21- quoted_url);
22- g_free (quoted_url);
23-
24- /* Sign the URL if we have OAuth tokens */
25- get_credentials (music_store,
26- &oauth_consumer_token,
27- &oauth_consumer_secret,
28- &oauth_token,
29- &oauth_token_secret);
30- if (oauth_consumer_token != NULL && oauth_consumer_secret != NULL &&
31- oauth_token != NULL && oauth_token_secret != NULL) {
32- gchar *signed_url;
33-
34- signed_url = oauth_sign_url2 (real_url, NULL, OA_HMAC, "GET",
35- oauth_consumer_token, oauth_consumer_secret,
36- oauth_token, oauth_token_secret);
37- webkit_web_view_open (WEBKIT_WEB_VIEW (music_store->priv->web_viewer), signed_url);
38-
39- g_free (signed_url);
40- } else
41- webkit_web_view_open (WEBKIT_WEB_VIEW (music_store->priv->web_viewer), real_url);
42-
43- g_free (real_url);
44+ webkit_web_view_open (WEBKIT_WEB_VIEW (music_store->priv->web_viewer),
45+ url);
46 }

Subscribers

People subscribed via source and target branches