Merge lp:~dobey/libubuntuone/faster-u1ms-pages into lp:libubuntuone

[dobey]

Stop any current loading pages when a new page is requested externally

[lp:~dobey/libubuntuone/faster-u1ms-pages]

141. By dobey on 2011-10-17

Fix typo in comment

[Manuel de la Peña (mandel)]

Code looks good and I understand the reasoning behind it after talking on irc, will like to test when banshee fixes are done.

review: Approve

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-10-03 16:50:38 +0000
+++ libubuntuone/u1-music-store.c	2011-10-17 14:36:23 +0000
@@ -1223,9 +1223,6 @@
 	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "notify",
 			  G_CALLBACK (viewer_property_changed_cb), 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);
-
 	/* Rescan the purchased music folder */
 	_u1_music_store_rescan_purchased_folder (music_store);
 
@@ -1353,8 +1350,13 @@
 	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);
 
+	/* 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);
+
 }
 
 /**
@@ -1413,6 +1415,9 @@
 	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);