aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-03-08 19:03:24 +0800
committerChristian Persch <chpe@src.gnome.org>2006-03-08 19:03:24 +0800
commit99813c0efc39abf67299abb7e53f7c6e8683fee2 (patch)
treee0c7bb72d5d9618cd6cc95b2930fb6f4b0517112
parent1ee2c6c87678dee6a06757a731eb4611ea2fae5c (diff)
downloadgsoc2013-epiphany-99813c0efc39abf67299abb7e53f7c6e8683fee2.tar
gsoc2013-epiphany-99813c0efc39abf67299abb7e53f7c6e8683fee2.tar.gz
gsoc2013-epiphany-99813c0efc39abf67299abb7e53f7c6e8683fee2.tar.bz2
gsoc2013-epiphany-99813c0efc39abf67299abb7e53f7c6e8683fee2.tar.lz
gsoc2013-epiphany-99813c0efc39abf67299abb7e53f7c6e8683fee2.tar.xz
gsoc2013-epiphany-99813c0efc39abf67299abb7e53f7c6e8683fee2.tar.zst
gsoc2013-epiphany-99813c0efc39abf67299abb7e53f7c6e8683fee2.zip
Don't throw when cancelling the dialogue with ESC. Fixes bug #333780,
2006-03-08 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyPromptService.cpp: Don't throw when cancelling the dialogue with ESC. Fixes bug #333780, patch has RT approval.
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/EphyPromptService.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 63b53c357..18fde2d83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-08 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/EphyPromptService.cpp:
+
+ Don't throw when cancelling the dialogue with ESC. Fixes bug #333780,
+ patch has RT approval.
+
2006-03-07 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/GlobalHistory.cpp:
diff --git a/embed/mozilla/EphyPromptService.cpp b/embed/mozilla/EphyPromptService.cpp
index c360dcbc4..c121978bc 100644
--- a/embed/mozilla/EphyPromptService.cpp
+++ b/embed/mozilla/EphyPromptService.cpp
@@ -68,7 +68,7 @@ enum
RESPONSE_ABORT_SCRIPT = 42
};
-#define RETVAL(r) ((r) == GTK_RESPONSE_DELETE_EVENT ? NS_ERROR_FAILURE : NS_OK)
+#define RETVAL(r) (NS_OK)
class Prompter
{