aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-09-26 20:49:09 +0800
committerChristian Persch <chpe@src.gnome.org>2005-09-26 20:49:09 +0800
commit90e9c33223a8a56dbd97e8b45cb313bfa27a0100 (patch)
treedd099c446a37f8788caefb09dd07ca41f02edf66 /embed
parent58bf466c8f6c5dd6132164ef3ac002be26b5933c (diff)
downloadgsoc2013-epiphany-90e9c33223a8a56dbd97e8b45cb313bfa27a0100.tar
gsoc2013-epiphany-90e9c33223a8a56dbd97e8b45cb313bfa27a0100.tar.gz
gsoc2013-epiphany-90e9c33223a8a56dbd97e8b45cb313bfa27a0100.tar.bz2
gsoc2013-epiphany-90e9c33223a8a56dbd97e8b45cb313bfa27a0100.tar.lz
gsoc2013-epiphany-90e9c33223a8a56dbd97e8b45cb313bfa27a0100.tar.xz
gsoc2013-epiphany-90e9c33223a8a56dbd97e8b45cb313bfa27a0100.tar.zst
gsoc2013-epiphany-90e9c33223a8a56dbd97e8b45cb313bfa27a0100.zip
Back out previous change, it doesn't work right when there are *two*
2005-09-26 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/Makefile.am: * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: (DoDialog): Back out previous change, it doesn't work right when there are *two* dialogues shown: the 1st one can only be dismissed after the 2nd one has been dismissed.
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/GtkNSSSecurityWarningDialogs.cpp9
-rw-r--r--embed/mozilla/Makefile.am2
2 files changed, 1 insertions, 10 deletions
diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
index 1caa3e415..5bdc894d3 100644
--- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
+++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
@@ -47,7 +47,6 @@
#include "GtkNSSSecurityWarningDialogs.h"
#include "EphyUtils.h"
-#include "AutoEventQueue.h"
#include <nsCOMPtr.h>
#include <nsIPrefBranch.h>
@@ -201,12 +200,6 @@ GtkNSSSecurityWarningDialogs::DoDialog (nsIInterfaceRequestor *aContext,
{
*_retval = PR_FALSE;
- /* Work around this broken API by pushing a new event queue. Otherwise
- * networking will block while the dialogue is shown!
- */
- AutoEventQueue queue;
- if (NS_FAILED (queue.Init ())) return;
-
nsresult rv;
PRBool show = PR_TRUE;
nsCOMPtr<nsIPrefBranch> prefBranch
@@ -272,6 +265,7 @@ GtkNSSSecurityWarningDialogs::DoDialog (nsIInterfaceRequestor *aContext,
gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
int response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
*_retval = (response == GTK_RESPONSE_ACCEPT || response == GTK_RESPONSE_OK);
@@ -280,6 +274,5 @@ GtkNSSSecurityWarningDialogs::DoDialog (nsIInterfaceRequestor *aContext,
prefBranch->SetBoolPref (showOncePref, PR_FALSE);
}
- gtk_widget_destroy (dialog);
g_free (showOncePref);
}
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index def68f77b..ae1585ca2 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -1,8 +1,6 @@
noinst_LTLIBRARIES = libephymozillaembed.la
libephymozillaembed_la_SOURCES = \
- AutoEventQueue.cpp \
- AutoEventQueue.h \
ContentHandler.cpp \
ContentHandler.h \
EphyContentPolicy.cpp \