Use nsIDOMWindow2 to get the event target for mozilla >= 1.7rc3.

2004-07-31  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/EphyBrowser.cpp:

	Use nsIDOMWindow2 to get the event target for mozilla >= 1.7rc3.

2 files changed, 22 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 882c27afe..397a921b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-07-31  Christian Persch  <chpe@cvs.gnome.org>
 
+	* embed/mozilla/EphyBrowser.cpp:
+
+	Use nsIDOMWindow2 to get the event target for mozilla >= 1.7rc3.
+
+2004-07-31  Christian Persch  <chpe@cvs.gnome.org>
+
 	* embed/mozilla/EphyContentPolicy.cpp:
 
 	Typo fix.
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index d3257e5d4..0a6108d41 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -86,6 +86,10 @@
 #include "MozillaPrivate.h"
 #include "print-dialog.h"
 
+#if MOZILLA_SNAPSHOT >= 17
+#include "nsIDOMWindow2.h"
+#endif
+
 EphyEventListener::EphyEventListener(void)
 : mOwner(nsnull)
 {
@@ -244,7 +248,16 @@ EphyBrowser::GetListener (void)
 
   	nsCOMPtr<nsIDOMWindow> domWindowExternal;
   	mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindowExternal));
-  
+
+#if MOZILLA_SNAPSHOT >= 17
+	nsCOMPtr<nsIDOMWindow2> domWindow (do_QueryInterface (domWindowExternal));
+	NS_ENSURE_TRUE (domWindow, NS_ERROR_FAILURE);
+
+	nsCOMPtr<nsIDOMEventTarget> rootWindow;
+	domWindow->GetWindowRoot (getter_AddRefs (rootWindow));
+
+	mEventReceiver = do_QueryInterface (rootWindow);
+#else
   	nsCOMPtr<nsIDOMWindowInternal> domWindow;
         domWindow = do_QueryInterface(domWindowExternal);
 	
@@ -255,6 +268,8 @@ EphyBrowser::GetListener (void)
   	piWin->GetChromeEventHandler(getter_AddRefs(chromeHandler));
 
   	mEventReceiver = do_QueryInterface(chromeHandler);
+#endif /* MOZILLA_SNAPSHOT >= 17 */
+
 	NS_ENSURE_TRUE (mEventReceiver, NS_ERROR_FAILURE);
 
 	return NS_OK;