aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/EventContext.cpp7
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 15372e54e..63dbd15b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-08-07 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/EventContext.cpp:
+
+ Don't start search on <embed> and <object> elements.
+
+2006-08-07 Christian Persch <chpe@cvs.gnome.org>
+
* data/default-prefs-common.js:
Don't leak the UI language.
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index dfb29dac6..27166d976 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -44,6 +44,7 @@
#include <nsIDOMHTMLAreaElement.h>
#include <nsIDOMHTMLBodyElement.h>
#include <nsIDOMHTMLButtonElement.h>
+#include <nsIDOMHTMLEmbedElement.h>
#include <nsIDOMHTMLImageElement.h>
#include <nsIDOMHTMLInputElement.h>
#include <nsIDOMHTMLIsIndexElement.h>
@@ -1060,10 +1061,14 @@ EventContext::CheckKeyPress (nsIDOMKeyEvent *aEvent)
nsCOMPtr<nsIDOMHTMLTextAreaElement> textArea;
nsCOMPtr<nsIDOMHTMLSelectElement> selectElement;
nsCOMPtr<nsIDOMHTMLIsIndexElement> indexElement;
+ nsCOMPtr<nsIDOMHTMLObjectElement> objectElement;
+ nsCOMPtr<nsIDOMHTMLEmbedElement> embedElement;
if ((textArea = do_QueryInterface (target)) ||
(selectElement = do_QueryInterface (target)) ||
- (indexElement = do_QueryInterface (target))) return retval;
+ (indexElement = do_QueryInterface (target)) ||
+ (objectElement = do_QueryInterface (target)) ||
+ (embedElement = do_QueryInterface (target))) return retval;
/* check for design mode */
nsCOMPtr<nsIDOMNode> node (do_QueryInterface (target, &rv));