diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSSecurityWarningDialogs.cpp | 9 |
2 files changed, 19 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2005-01-09 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: + + Set show-once to PR_FALSE if the GetBoolPref call fails. + 2005-01-09 Crispin Flowerday <gnome@flowerday.cx> * src/Makefile.am (epiphany_CPPFLAGS): @@ -18,6 +24,16 @@ 2005-01-09 Christian Persch <chpe@cvs.gnome.org> + * data/ui/epiphany-fs-toolbar.xml: + * embed/ephy-embed.h: + * embed/mozilla/EphyBrowser.cpp: + * embed/mozilla/mozilla-embed-event.cpp: + * embed/mozilla/mozilla-embed-event.h: + * embed/mozilla/mozilla-embed.cpp: + * src/ephy-window.h: + +2005-01-09 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: * embed/mozilla/GtkNSSSecurityWarningDialogs.h: diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp index 5c3c30a9c..97d238314 100644 --- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp +++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp @@ -58,9 +58,6 @@ #include <glib/gi18n.h> #include <gtk/gtkdialog.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkcheckbutton.h> #include <gtk/gtkbox.h> #include <gtk/gtkhbox.h> #include <gtk/gtkvbox.h> @@ -220,7 +217,7 @@ GtkNSSSecurityWarningDialogs::DoDialog (nsIInterfaceRequestor *aContext, { showOncePref = g_strconcat (aPrefName, ".show_once", NULL); rv = prefBranch->GetBoolPref (showOncePref, &showOnce); - if (NS_FAILED (rv)) showOnce = PR_TRUE; + if (NS_FAILED (rv)) showOnce = PR_FALSE; } if (!show && !showOnce) @@ -270,9 +267,9 @@ GtkNSSSecurityWarningDialogs::DoDialog (nsIInterfaceRequestor *aContext, int response = gtk_dialog_run (GTK_DIALOG (dialog)); - *_retval = response == GTK_RESPONSE_ACCEPT; + *_retval = (response == GTK_RESPONSE_ACCEPT || response == GTK_RESPONSE_OK); - if (prefBranch && showOncePref && showOnce) + if (prefBranch && showOncePref && showOnce && *_retval) { prefBranch->SetBoolPref (showOncePref, PR_FALSE); } |