aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-02-13 03:30:48 +0800
committerChristian Persch <chpe@src.gnome.org>2004-02-13 03:30:48 +0800
commitfe1419fe5d8f024214f008cf7cf2af61cf7b241f (patch)
tree5f402b34bc54d745089d853ece22f8323a6ff2d9 /embed/mozilla
parenta77647ad79ad7cc0ea3ed4b648f246936f7867f6 (diff)
downloadgsoc2013-epiphany-fe1419fe5d8f024214f008cf7cf2af61cf7b241f.tar
gsoc2013-epiphany-fe1419fe5d8f024214f008cf7cf2af61cf7b241f.tar.gz
gsoc2013-epiphany-fe1419fe5d8f024214f008cf7cf2af61cf7b241f.tar.bz2
gsoc2013-epiphany-fe1419fe5d8f024214f008cf7cf2af61cf7b241f.tar.lz
gsoc2013-epiphany-fe1419fe5d8f024214f008cf7cf2af61cf7b241f.tar.xz
gsoc2013-epiphany-fe1419fe5d8f024214f008cf7cf2af61cf7b241f.tar.zst
gsoc2013-epiphany-fe1419fe5d8f024214f008cf7cf2af61cf7b241f.zip
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.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/GtkNSSDialogs.cpp3
2 files changed, 2 insertions, 3 deletions
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);