Don't insist on a parent for the dialogue; because there isn't one when we

2004-02-12  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/GtkNSSDialogs.cpp:

	Don't insist on a parent for the dialogue; because there isn't one
	when we try to load a favicon over https: at startup.

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 8d31acefe..89f9f5bf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-02-12  Christian Persch  <chpe@cvs.gnome.org>
 
+	* embed/mozilla/GtkNSSDialogs.cpp:
+
+	Don't insist on a parent for the dialogue; because there isn't one
+	when we try to load a favicon over https: at startup.
+
+2004-02-12  Christian Persch  <chpe@cvs.gnome.org>
+
 	* embed/ephy-embed-popup-control.c: (save_url),
 	(embed_popup_set_image_as_background_cmd):
 	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_get_type),
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 8cb9c1410..6f1cf7599 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -465,7 +465,7 @@ nsresult EphyBrowser::SetZoomOnDocshell (float aZoom, nsIDocShell *DocShell)
 	NS_ENSURE_TRUE (PresContext, NS_ERROR_FAILURE);
 
 #if MOZILLA_SNAPSHOT > 13
-	nsIDeviceContext *DeviceContext(nsnull);
+	nsIDeviceContext *DeviceContext;
 	DeviceContext = PresContext->DeviceContext();
 	NS_ENSURE_TRUE (DeviceContext, NS_ERROR_FAILURE);
 #else				
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index fa86c08cf..f443abef2 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -207,12 +207,11 @@ display_cert_warning_box (nsIInterfaceRequestor *ctx,
 	nsCOMPtr<nsIDOMWindow> parent = do_GetInterface (ctx);
 	GtkWidget *gparent = MozillaFindGtkParent (parent);
 
-        g_return_val_if_fail (GTK_IS_WINDOW (gparent), GTK_RESPONSE_CANCEL);
         g_return_val_if_fail (markup_text, GTK_RESPONSE_CANCEL);
         g_return_val_if_fail (!checkbox_text || checkbox_value, GTK_RESPONSE_CANCEL);
 	
 	dialog = gtk_dialog_new_with_buttons ("",
-					      GTK_WINDOW (gparent),
+					      gparent ? GTK_WINDOW (gparent) : NULL,
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      NULL);