aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-10-31 02:04:40 +0800
committerChristian Persch <chpe@src.gnome.org>2004-10-31 02:04:40 +0800
commit4c41745e525a7fc35f29622e382ec7f881cc2e50 (patch)
tree20e3f974f518a22e7d9b00ed8075a0cf653e2f89
parentebddd6104b96e1da09e8f6375ef7707ff42ee447 (diff)
downloadgsoc2013-epiphany-4c41745e525a7fc35f29622e382ec7f881cc2e50.tar
gsoc2013-epiphany-4c41745e525a7fc35f29622e382ec7f881cc2e50.tar.gz
gsoc2013-epiphany-4c41745e525a7fc35f29622e382ec7f881cc2e50.tar.bz2
gsoc2013-epiphany-4c41745e525a7fc35f29622e382ec7f881cc2e50.tar.lz
gsoc2013-epiphany-4c41745e525a7fc35f29622e382ec7f881cc2e50.tar.xz
gsoc2013-epiphany-4c41745e525a7fc35f29622e382ec7f881cc2e50.tar.zst
gsoc2013-epiphany-4c41745e525a7fc35f29622e382ec7f881cc2e50.zip
Check for nsIDOMNSEvent::GetIsTrusted.
2004-10-30 Christian Persch <chpe@cvs.gnome.org> * configure.ac: Check for nsIDOMNSEvent::GetIsTrusted. * embed/mozilla/EphyBrowser.cpp: Conditionally compile this code. * lib/ephy-marshal.list: Forgot to commit this.
-rw-r--r--ChangeLog14
-rw-r--r--configure.ac15
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--lib/ephy-marshal.list1
4 files changed, 32 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e432a3228..af2243ab4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,20 @@
2004-10-30 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
+
+ Check for nsIDOMNSEvent::GetIsTrusted.
+
+ * embed/mozilla/EphyBrowser.cpp:
+
+ Conditionally compile this code.
+
+ * lib/ephy-marshal.list:
+
+ Forgot to commit this.
+
+2004-10-30 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.ac:
* embed/ephy-embed.c: (ephy_embed_base_init):
* embed/ephy-embed.h:
* embed/mozilla/EphyBrowser.cpp:
diff --git a/configure.ac b/configure.ac
index c30027419..3bbbf53e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -344,6 +344,21 @@ dnl changed from nsIXULChromeRegistry in 1.8a4
AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/chrome/nsIChromeRegistrySea.h],
[AC_DEFINE([HAVE_CHROME_NSICHROMEREGISTRYSEA_H], [1], [Define if nsIChromeRegistrySea.h exists])])
+dnl added after 1.7.3, on aviary and in 1.8a5 on trunk
+
+AC_MSG_CHECKING([for nsIDOMNSEvent::GetIsTrusted])
+
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <dom/nsIDOMNSEvent.h>]],
+ [[nsIDOMNSEvent *p;
+ p->GetIsTrusted (nsnull);]]
+ )],
+ [AC_DEFINE([MOZ_NSIDOMNSEVENT_GETISTRUSTED],[1],[dummy]) result=yes],
+ [result=no])
+
+AC_MSG_RESULT([$result])
+
dnl check for broken reload in GtkMozEmbed
dnl FIXME: I have NO IDEA how to do this. For now, just always enable our workaround
dnl
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index da69e21b3..58826f5f0 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -216,6 +216,7 @@ EphyPopupBlockEventListener::HandleEvent (nsIDOMEvent * aDOMEvent)
NS_IMETHODIMP
EphyModalAlertEventListener::HandleEvent (nsIDOMEvent * aDOMEvent)
{
+#ifdef MOZ_NSIDOMNSEVENT_GETISTRUSTED
NS_ENSURE_TRUE (mOwner, NS_ERROR_FAILURE);
/* make sure the event is trusted */
@@ -251,6 +252,7 @@ EphyModalAlertEventListener::HandleEvent (nsIDOMEvent * aDOMEvent)
{
g_signal_emit_by_name (mOwner, "ge-modal-alert-closed");
}
+#endif
return NS_OK;
}
diff --git a/lib/ephy-marshal.list b/lib/ephy-marshal.list
index e931ff895..23b5084f1 100644
--- a/lib/ephy-marshal.list
+++ b/lib/ephy-marshal.list
@@ -1,6 +1,7 @@
INT:STRING
BOOLEAN:OBJECT
BOOLEAN:STRING, STRING
+BOOLEAN:VOID
VOID:ENUM,INT,BOOLEAN
VOID:INT,INT
VOID:POINTER,INT