Merge lp:~dobey/libubuntuone/crash-workaround into lp:libubuntuone

[dobey]

Work around a crash introduced by changes in WebKit 1.4.3

[Roman Yepishev (rye)]

Looks good!

review: Approve (fieldtest)

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-09-09 15:11:47 +0000
+++ libubuntuone/u1-music-store.c	2011-09-29 18:32:23 +0000
@@ -58,7 +58,6 @@
 	gchar *base_url;
 
 	GtkWidget *scroll;
-	GtkWidget *initial_web_viewer;
 	GtkWidget *web_viewer;
 	WebKitWebFrame *frame_to_use;
 	GtkWidget *progress;
@@ -867,16 +866,6 @@
 
 	uri = soup_uri_new (webkit_web_view_get_uri (web_view));
 
-	/* Remove the initial view if still around */
-	if (music_store->priv->initial_web_viewer != NULL) {
-		gtk_widget_destroy (music_store->priv->initial_web_viewer);
-		music_store->priv->initial_web_viewer = NULL;
-
-		/* And show the real store viewer */
-		gtk_widget_show (music_store->priv->web_viewer);
-		gtk_container_add (GTK_CONTAINER (music_store->priv->scroll), music_store->priv->web_viewer);
-	}
-
 	/* Inject some JavaScript to enable previews and hide the Flash player */
 	execute_script (web_view, "u1-preview.js", NULL);
 
@@ -1231,19 +1220,13 @@
 	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);
 
-	/* Create a hidden progress bar */
-	music_store->priv->progress = gtk_progress_bar_new ();
-	
 	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);
 
-	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);
-
+	/* Rescan the purchased music folder */
 	_u1_music_store_rescan_purchased_folder (music_store);
 
 	return FALSE;
@@ -1323,17 +1306,10 @@
 			  G_CALLBACK (load_error_cb), music_store);
 
 	/* Show a temp view when loading the initial store page */
-	music_store->priv->initial_web_viewer = webkit_web_view_new ();
-	g_object_set (G_OBJECT (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (music_store->priv->initial_web_viewer))),
-		      "user-agent", new_user_agent,
-		      "default-encoding", DEFAULT_ENCODING,
-		      "enable-default-context-menu", g_getenv ("U1SHOWCONTEXTMENU") != NULL,
-		      "enable-plugins", FALSE,
-		      NULL);
-	load_internal_html_page (WEBKIT_WEB_VIEW (music_store->priv->initial_web_viewer), 
+	load_internal_html_page (WEBKIT_WEB_VIEW (music_store->priv->web_viewer), 
 	                         U1_CONNECTING_PAGE, NULL);
-	gtk_widget_show (music_store->priv->initial_web_viewer);
-	gtk_container_add (GTK_CONTAINER (music_store->priv->scroll), music_store->priv->initial_web_viewer);
+	gtk_widget_show (music_store->priv->web_viewer);
+	gtk_container_add (GTK_CONTAINER (music_store->priv->scroll), music_store->priv->web_viewer);
 
 	/* Create the alert bar */
 	music_store->priv->alertbar = gtk_hbox_new (FALSE, 12);
@@ -1370,6 +1346,13 @@
 	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);
+
 	g_timeout_add_seconds(10, (GSourceFunc) _u1_music_store_delayed_init,
 			      music_store);
 }