diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSSecurityWarningDialogs.cpp | 9 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 2 |
3 files changed, 10 insertions, 10 deletions
@@ -1,6 +1,15 @@ 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. + +2005-09-26 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/Makefile.am: * embed/mozilla/AutoEventQueue.cpp: * embed/mozilla/AutoEventQueue.h: * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: (DoDialog): 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 \ |