Merge lp:~dobey/libubuntuone/update-from-trunk into lp:libubuntuone/stable-3-0

[dobey]

Don't register the custom handler for libsoup for now
Delay the initial loading of the connecting page, to avoid a race condition
Add a delay to the initial main store page loading, to avoid a race
Move progress bar creation, and notify signal connect, to avoid racing
Avoid an unneeded second call to get the URI from webkit in nav request

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~dobey/libubuntuone/update-from-trunk]

152. By dobey on 2012-03-07

Don't register the custom handler for libsoup for now
Delay the initial loading of the connecting page, to avoid a race condition
Add a delay to the initial main store page loading, to avoid a race
Move progress bar creation, and notify signal connect, to avoid racing
Avoid an unneeded second call to get the URI from webkit in nav request

=== modified file 'libubuntuoneui/u1-music-store.c'
--- libubuntuoneui/u1-music-store.c	2012-01-31 20:46:15 +0000
+++ libubuntuoneui/u1-music-store.c	2012-03-06 21:35:22 +0000
@@ -544,12 +544,13 @@
 		music_store->priv->watched_downloads = NULL;
 	}
 
+	network_uri = webkit_network_request_get_uri (request);
+
 	/* Capture URLs we're interested in */
-	parsed_uri = soup_uri_new (webkit_network_request_get_uri (request));
+	parsed_uri = soup_uri_new (network_uri);
 	if (parsed_uri == NULL)
 		return FALSE;
 
-	network_uri = webkit_network_request_get_uri (request);
 	if (network_uri != NULL && g_str_has_prefix (network_uri, U1_NOT_REGISTERED_URL)) {
 		fire_authentication (music_store, request, policy_decision);
 	} else if (g_str_has_prefix (parsed_uri->path, "/auth/login") &&
@@ -561,7 +562,6 @@
 		fire_authentication (music_store, request, policy_decision);
 	} else if (g_strrstr (parsed_uri->path, "library.aspx") != NULL ||
 		 g_str_has_prefix (parsed_uri->path, "/music/store/library")) {
-		//g_str_has_prefix (webkit_network_request_get_uri (request), "https://one.ubuntu.com/music/store/library")) {
 		const gchar *library_override;
 
 		/* If the URL being loaded is the 7d library page, and we have a library
@@ -1222,9 +1222,6 @@
 	folder_info = syncdaemon_daemon_get_folder_info (music_store->priv->syncdaemon, u1_music_store_get_library_location (music_store));
 	music_store->priv->folder_subscribed = syncdaemon_folder_info_get_subscribed (folder_info);
 
-	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "notify",
-			  G_CALLBACK (viewer_property_changed_cb), music_store);
-
 	/* Rescan the purchased music folder */
 	_u1_music_store_rescan_purchased_folder (music_store);
 
@@ -1266,6 +1263,9 @@
 
 	music_store->priv->base_url = g_strdup (url_to_use);
 
+	/* Create a hidden progress bar */
+	music_store->priv->progress = gtk_progress_bar_new ();
+	
 	/* Create web viewer object */
 	music_store->priv->scroll = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (music_store->priv->scroll),
@@ -1291,9 +1291,6 @@
 	/* Use GNOME proxy settings */
 	soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
 
-	/* Add our handler for u1chrome: URIs */
-	soup_session_add_feature_by_type (session, U1_TYPE_REQUEST_CHROME);
-
 	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "navigation-policy-decision-requested",
 				  G_CALLBACK (navigation_requested_cb), music_store);
 	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "load-finished",
@@ -1303,9 +1300,9 @@
 	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "load-error",
 			  G_CALLBACK (load_error_cb), music_store);
 
-	/* Show a temp view when loading the initial store page */
-	load_internal_html_page (WEBKIT_WEB_VIEW (music_store->priv->web_viewer), 
-	                         U1_CONNECTING_PAGE, NULL);
+	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "notify",
+			  G_CALLBACK (viewer_property_changed_cb), music_store);
+
 	gtk_widget_show (music_store->priv->web_viewer);
 	gtk_container_add (GTK_CONTAINER (music_store->priv->scroll), music_store->priv->web_viewer);
 
@@ -1344,19 +1341,20 @@
 	g_signal_connect (G_OBJECT (music_store->priv->subscribe_btn), "clicked",
 			  G_CALLBACK (subscribe_purchased_folder), music_store);
 
-	/* Create a hidden progress bar */
-	music_store->priv->progress = gtk_progress_bar_new ();
-	
 	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->alertbar, FALSE, FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->scroll, TRUE, TRUE, 0);
 	gtk_box_pack_end (GTK_BOX (music_store), music_store->priv->progress, FALSE, FALSE, 0);
 
+	/* Load the temporary connecting page */
+	load_internal_html_page (WEBKIT_WEB_VIEW (music_store->priv->web_viewer), 
+	                         U1_CONNECTING_PAGE, NULL);
+
 	/* Rescan for things later */
 	g_timeout_add_seconds(10, (GSourceFunc) _u1_music_store_delayed_init,
 			      music_store);
 
 	/* And load the real store in the background */
-	music_store->priv->idle_cb = g_idle_add ((GSourceFunc) load_real_store_cb, music_store);
+	music_store->priv->idle_cb = g_timeout_add_seconds (2, (GSourceFunc) load_real_store_cb, music_store);
 
 }
 
@@ -1416,15 +1414,15 @@
 	g_return_if_fail (U1_IS_MUSIC_STORE (music_store));
 	g_return_if_fail (url != NULL);
 
-	/* Stop any currently pending or active page loads first */
-	webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (music_store->priv->web_viewer));
-
 	/* If the load_real_store callback is set up, disable it first */
 	if (music_store->priv->idle_cb > 0) {
 		g_source_remove (music_store->priv->idle_cb);
 		music_store->priv->idle_cb = 0;
 	}
 
+	/* 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,