Merge lp:~dobey/libubuntuone/fix-crits into lp:libubuntuone

Proposed by dobey on 2012-03-05
Status: Merged
Approved by: dobey on 2012-03-06
Approved revision: 148
Merged at revision: 148
Proposed branch: lp:~dobey/libubuntuone/fix-crits
Merge into: lp:libubuntuone
Diff against target: 34 lines (+4/-6)
1 file modified
libubuntuoneui/u1-music-store.c (+4/-6)
To merge this branch: bzr merge lp:~dobey/libubuntuone/fix-crits
Reviewer Review Type Date Requested Status
Eric Casteleijn (community) Approve on 2012-03-06
Natalia Bidart 2012-03-05 Approve on 2012-03-06
Review via email: mp+96008@code.launchpad.net

Commit message

Don't register the custom handler for libsoup for now
Delay the initial loading of the connecting page, to avoid a race condition

To post a comment you must log in.
Natalia Bidart (nataliabidart) wrote :

Looks good.

review: Approve
Eric Casteleijn (thisfred) wrote :

+1

review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :

Attempt to merge into lp:libubuntuone failed due to conflicts:

text conflict in libubuntuoneui/u1-music-store.c

lp:~dobey/libubuntuone/fix-crits updated on 2012-03-06
148. By dobey on 2012-03-06

Merged with trunk to resolve conflict

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-03-06 03:29:52 +0000
3+++ libubuntuoneui/u1-music-store.c 2012-03-06 21:14:17 +0000
4@@ -1291,9 +1291,6 @@
5 /* Use GNOME proxy settings */
6 soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
7
8- /* Add our handler for u1chrome: URIs */
9- soup_session_add_feature_by_type (session, U1_TYPE_REQUEST_CHROME);
10-
11 g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "navigation-policy-decision-requested",
12 G_CALLBACK (navigation_requested_cb), music_store);
13 g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "load-finished",
14@@ -1306,9 +1303,6 @@
15 g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "notify",
16 G_CALLBACK (viewer_property_changed_cb), music_store);
17
18- /* Show a temp view when loading the initial store page */
19- load_internal_html_page (WEBKIT_WEB_VIEW (music_store->priv->web_viewer),
20- U1_CONNECTING_PAGE, NULL);
21 gtk_widget_show (music_store->priv->web_viewer);
22 gtk_container_add (GTK_CONTAINER (music_store->priv->scroll), music_store->priv->web_viewer);
23
24@@ -1351,6 +1345,10 @@
25 gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->scroll, TRUE, TRUE, 0);
26 gtk_box_pack_end (GTK_BOX (music_store), music_store->priv->progress, FALSE, FALSE, 0);
27
28+ /* Load the temporary connecting page */
29+ load_internal_html_page (WEBKIT_WEB_VIEW (music_store->priv->web_viewer),
30+ U1_CONNECTING_PAGE, NULL);
31+
32 /* Rescan for things later */
33 g_timeout_add_seconds(10, (GSourceFunc) _u1_music_store_delayed_init,
34 music_store);

Subscribers

People subscribed via source and target branches