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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 570224bc42b535ff9dc2d765d4b2acdb8a8c4e9e
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 18 20:57:05 2004 +0000

            Reviewed by Darin
    
            - fixed <rdar://problem/3534851> Pop up windows not showing up within SAP's
            BW Module (changing location.href on new window created by window.open)
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::scheduleRedirection):
            allow new redirect to win if delay <= current delay, not just <
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6885 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 31e699f..0e3b5f1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-06-18  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Darin
+        
+        - fixed <rdar://problem/3534851> Pop up windows not showing up within SAP's 
+        BW Module (changing location.href on new window created by window.open)
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::scheduleRedirection):
+        allow new redirect to win if delay <= current delay, not just <
+
 === Safari-146 ===
 
 2004-06-17  Richard Williamson   <rjw at apple.com>
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 8ac2a26..8ce13a5 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1926,7 +1926,7 @@ void KHTMLPart::scheduleRedirection( double delay, const QString &url, bool doLo
     kdDebug(6050) << "KHTMLPart::scheduleRedirection delay=" << delay << " url=" << url << endl;
     if (delay < 0 || delay > INT_MAX / 1000)
       return;
-    if ( d->m_scheduledRedirection == noRedirectionScheduled || delay < d->m_delayRedirect )
+    if ( d->m_scheduledRedirection == noRedirectionScheduled || delay <= d->m_delayRedirect )
     {
        if (d->m_doc == 0){
         // Handle a location change of a page with no document as a special case.

-- 
WebKit Debian packaging