aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/AutoWindowModalState.cpp7
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 01092d1f9..6ef61e652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
* embed/mozilla/AutoWindowModalState.cpp:
+ Revert part of the last change, we don't need the top window here.
+
+2006-10-06 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/AutoWindowModalState.cpp:
+
Use the top DOM window here, and adapt to gecko 1.8.1.
2006-10-05 Christian Persch <chpe@cvs.gnome.org>
diff --git a/embed/mozilla/AutoWindowModalState.cpp b/embed/mozilla/AutoWindowModalState.cpp
index 20100e60c..c6185107b 100644
--- a/embed/mozilla/AutoWindowModalState.cpp
+++ b/embed/mozilla/AutoWindowModalState.cpp
@@ -27,12 +27,7 @@ AutoWindowModalState::AutoWindowModalState (nsIDOMWindow *aWindow)
{
#ifdef HAVE_GECKO_1_8_1
if (aWindow) {
- nsresult rv;
- nsCOMPtr<nsIDOMWindow> topWin;
- rv = aWindow->GetTop (getter_AddRefs (topWin));
- if (NS_SUCCEEDED (rv)) {
- mWindow = do_QueryInterface (topWin);
- }
+ mWindow = do_QueryInterface (aWindow);
NS_ASSERTION (mWindow, "Should have a window here!");
}