Index: embed/mozilla/MozDownload.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/MozDownload.cpp,v
retrieving revision 1.73
diff -u -r1.73 MozDownload.cpp
--- embed/mozilla/MozDownload.cpp	7 Jul 2005 13:10:25 -0000	1.73
+++ embed/mozilla/MozDownload.cpp	10 Aug 2005 12:20:26 -0000
@@ -369,7 +369,9 @@
 	}
 
 	/* We will get this even in the event of a cancel */
-	if (aStateFlags & STATE_STOP)
+	/* Be careful that download is only completed when STATE_IS_NETWORK is set
+ 	   and many lonely STOP events may be triggered before */
+	if (aStateFlags & STATE_STOP && aStateFlags & STATE_IS_NETWORK)
 	{
 		/* Keep us alive */
 		nsCOMPtr<nsITransfer> kungFuDeathGrip(this);
Index: embed/mozilla/mozilla-embed.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/mozilla-embed.cpp,v
retrieving revision 1.115
diff -u -r1.115 mozilla-embed.cpp
--- embed/mozilla/mozilla-embed.cpp	6 Aug 2005 22:26:45 -0000	1.115
+++ embed/mozilla/mozilla-embed.cpp	10 Aug 2005 12:20:27 -0000
@@ -226,7 +226,6 @@
 mozilla_embed_realize (GtkWidget *widget)
 {
 	MozillaEmbedPrivate *mpriv = MOZILLA_EMBED (widget)->priv;
-	GtkBin *bin = GTK_BIN (widget);
 
 	GTK_WIDGET_CLASS (parent_class)->realize (widget);
 
@@ -269,7 +268,7 @@
 
 	if (mpriv->focus_connected) return;
 
-	GtkWidget *child = gtk_bin_get_child (bin);
+	GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget));
 	g_return_if_fail (child != NULL);
 
 	n = g_signal_handlers_block_matched (child,