aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@gnome.org>2007-08-15 16:04:05 +0800
committerDiego Escalante Urrelo <diegoe@src.gnome.org>2007-08-15 16:04:05 +0800
commitf615d984849907b54f21ff1b6de0872913d0e6b5 (patch)
tree79192a1631c7a5e616c41b789e077794b557852d
parentec96881f6e30e029c308eefe982a30da6fdca779 (diff)
downloadgsoc2013-epiphany-f615d984849907b54f21ff1b6de0872913d0e6b5.tar
gsoc2013-epiphany-f615d984849907b54f21ff1b6de0872913d0e6b5.tar.gz
gsoc2013-epiphany-f615d984849907b54f21ff1b6de0872913d0e6b5.tar.bz2
gsoc2013-epiphany-f615d984849907b54f21ff1b6de0872913d0e6b5.tar.lz
gsoc2013-epiphany-f615d984849907b54f21ff1b6de0872913d0e6b5.tar.xz
gsoc2013-epiphany-f615d984849907b54f21ff1b6de0872913d0e6b5.tar.zst
gsoc2013-epiphany-f615d984849907b54f21ff1b6de0872913d0e6b5.zip
Default to Cancel on Cert dialogues, patch by Cosimo Cecchi. Fixes bug
2007-08-15 Diego Escalante Urrelo <diegoe@gnome.org> * embed/mozilla/GtkNSSDialogs.cpp: Default to Cancel on Cert dialogues, patch by Cosimo Cecchi. Fixes bug #163379. svn path=/trunk/; revision=7275
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/GtkNSSDialogs.cpp11
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 31a6ee255..90af3beb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-08-15 Diego Escalante Urrelo <diegoe@gnome.org>
+ * embed/mozilla/GtkNSSDialogs.cpp:
+
+ Default to Cancel on Cert dialogues, patch by Cosimo Cecchi.
+ Fixes bug #163379.
+
+2007-08-15 Diego Escalante Urrelo <diegoe@gnome.org>
+
* embed/mozilla/EphyUtils.cpp:
* embed/mozilla/EphyHeaderSniffer.cpp:
* embed/mozilla/MozDownload.cpp:
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index 25b99d141..ba36d817d 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -263,7 +263,7 @@ display_cert_warning_box (nsIInterfaceRequestor *ctx,
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_View Certificate"),
NSSDIALOG_RESPONSE_VIEW_CERT);
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL,
+ button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
if (affirmative_text == NULL)
@@ -271,10 +271,9 @@ display_cert_warning_box (nsIInterfaceRequestor *ctx,
affirmative_text = _("_Accept");
}
- button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- affirmative_text,
+ gtk_dialog_add_button (GTK_DIALOG (dialog), affirmative_text,
GTK_RESPONSE_ACCEPT);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
if (checkbox_text)
{
@@ -293,7 +292,7 @@ display_cert_warning_box (nsIInterfaceRequestor *ctx,
gtk_widget_grab_focus (button);
gtk_label_set_markup (GTK_LABEL (label), markup_text);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
gtk_widget_show_all (dialog);
while (1)
@@ -638,7 +637,7 @@ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx,
higgy_setup_dialog (GTK_DIALOG (dialog), GTK_STOCK_DIALOG_WARNING,
&label, NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
nsString commonName;
cert->GetCommonName (commonName);