[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 48a4a372945b8076465ada194619f8c5dd2561ac
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 19 03:08:33 2003 +0000

            Reviewed by John.
    
    	- fixed 3149511 - Blogger.com window closes after update is posted
    
            * khtml/ecma/kjs_window.cpp:
            (WindowFunc::tryCall): For now, don't allow closing the window at
    	all if it wasn't opened by JavaScript, since we don't support the
    	history object and so can't tell if the window has only one
    	history item.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3355 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 27198dc..c136e89 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-01-17  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3149511 - Blogger.com window closes after update is posted
+	
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): For now, don't allow closing the window at
+	all if it wasn't opened by JavaScript, since we don't support the
+	history object and so can't tell if the window has only one
+	history item.
+
 2003-01-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 27198dc..c136e89 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-01-17  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3149511 - Blogger.com window closes after update is posted
+	
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): For now, don't allow closing the window at
+	all if it wasn't opened by JavaScript, since we don't support the
+	history object and so can't tell if the window has only one
+	history item.
+
 2003-01-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index b4060fe..387fee7 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1391,7 +1391,13 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
            || KMessageBox::questionYesNo( window->part()->widget(), i18n("Close window?"), i18n("Confirmation Required") ) == KMessageBox::Yes
 #endif
            )
+	// FIXME: we can't ever close a non-JS window until we fix the
+	// history object to really work.
+#if APPLE_CHANGES
+	;
+#else
         (const_cast<Window*>(window))->scheduleClose();
+#endif
     }
     else
     {

-- 
WebKit Debian packaging