Drop support for mozilla < 1.7.5.

2005-05-14  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:
	* embed/mozilla/EphyBrowser.cpp:

	Drop support for mozilla < 1.7.5.

3 files changed, 7 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 602926d13..bb484a964 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
 
 	* configure.ac:
 	* embed/mozilla/EphyBrowser.cpp:
+
+	Drop support for mozilla < 1.7.5.
+
+2005-05-14  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.ac:
+	* embed/mozilla/EphyBrowser.cpp:
 	* embed/mozilla/EphyBrowser.h:
 	* embed/mozilla/mozilla-embed.cpp:
 
diff --git a/configure.ac b/configure.ac
index a194562b4..c20629b9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,21 +360,6 @@ 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],[Define if nsIDOMNSEvent::GetIsTrusted exists]) result=yes],
-	[result=no])
-
-AC_MSG_RESULT([$result])
-
 dnl changed location in 1.8a6
 
 AC_MSG_CHECKING([for mozilla security compoment])
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 85a0a9f8c..819f7269c 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -134,14 +134,12 @@ EphyEventListener::Init (EphyBrowser *aOwner)
 NS_IMETHODIMP
 EphyDOMLinkEventListener::HandleEvent (nsIDOMEvent* aDOMEvent)
 {
-#ifdef MOZ_NSIDOMNSEVENT_GETISTRUSTED
 	/* make sure the event is trusted */
 	nsCOMPtr<nsIDOMNSEvent> nsEvent (do_QueryInterface (aDOMEvent));
 	NS_ENSURE_TRUE (nsEvent, NS_ERROR_FAILURE);
 	PRBool isTrusted = PR_FALSE;
 	nsEvent->GetIsTrusted (&isTrusted);
 	if (!isTrusted) return NS_OK;
-#endif /* MOZ_NSIDOMNSEVENT_GETISTRUSTED */
 
 	nsCOMPtr<nsIDOMEventTarget> eventTarget;
 	aDOMEvent->GetTarget(getter_AddRefs(eventTarget));
@@ -293,14 +291,12 @@ EphyDOMContentLoadedEventListener::HandleEvent (nsIDOMEvent* aDOMEvent)
 {
 	LOG ("DOMContentLoaded event fired up");
 
-#ifdef MOZ_NSIDOMNSEVENT_GETISTRUSTED
 	/* make sure the event is trusted */
 	nsCOMPtr<nsIDOMNSEvent> nsEvent (do_QueryInterface (aDOMEvent));
 	NS_ENSURE_TRUE (nsEvent, NS_ERROR_FAILURE);
 	PRBool isTrusted = PR_FALSE;
 	nsEvent->GetIsTrusted (&isTrusted);
 	if (!isTrusted) return NS_OK;
-#endif /* MOZ_NSIDOMNSEVENT_GETISTRUSTED */
 
 	g_signal_emit_by_name (mOwner->mEmbed, "dom_content_loaded", (gpointer)aDOMEvent);
 
@@ -332,14 +328,12 @@ EphyDOMLinkEventListener::GetDocURI (nsIDOMElement *aElement,
 NS_IMETHODIMP
 EphyPopupBlockEventListener::HandleEvent (nsIDOMEvent * aDOMEvent)
 {
-#ifdef MOZ_NSIDOMNSEVENT_GETISTRUSTED
 	/* make sure the event is trusted */
 	nsCOMPtr<nsIDOMNSEvent> nsEvent (do_QueryInterface (aDOMEvent));
 	NS_ENSURE_TRUE (nsEvent, NS_ERROR_FAILURE);
 	PRBool isTrusted = PR_FALSE;
 	nsEvent->GetIsTrusted (&isTrusted);
 	if (!isTrusted) return NS_OK;
-#endif /* MOZ_NSIDOMNSEVENT_GETISTRUSTED */
 
 	nsCOMPtr<nsIDOMPopupBlockedEvent> popupEvent =
 		do_QueryInterface (aDOMEvent);
@@ -373,7 +367,6 @@ 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 */
@@ -409,7 +402,6 @@ EphyModalAlertEventListener::HandleEvent (nsIDOMEvent * aDOMEvent)
 	{
 		g_signal_emit_by_name (mOwner->mEmbed, "ge-modal-alert-closed");
 	}
-#endif
 
 	return NS_OK;
 }