[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 5a370379e2607fb8ea7968c0fdffd949650379d2
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 16 22:37:31 2002 +0000

    	Fixed bug Chris noticed where Alexander wasn't putting up
    	an error sheet on failed page visits.
    
    	* WebView.subproj/IFWebFramePrivate.mm:
    	(-[IFWebFrame _isLoadComplete]): Don't set provisionalDataSource
    	to nil until after sending it locationChangeDone.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1033 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ce58fab..37f7cfb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-16  John Sullivan  <sullivan at apple.com>
+
+	Fixed bug Chris noticed where Alexander wasn't putting up
+	an error sheet on failed page visits.
+
+	* WebView.subproj/IFWebFramePrivate.mm: 
+	(-[IFWebFrame _isLoadComplete]): Don't set provisionalDataSource
+	to nil until after sending it locationChangeDone.
+
 2002-04-16  Darin Adler  <darin at apple.com>
 
 	* WebView.subproj/IFBaseWebController.mm: Remove special release handling because
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ce58fab..37f7cfb 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-04-16  John Sullivan  <sullivan at apple.com>
+
+	Fixed bug Chris noticed where Alexander wasn't putting up
+	an error sheet on failed page visits.
+
+	* WebView.subproj/IFWebFramePrivate.mm: 
+	(-[IFWebFrame _isLoadComplete]): Don't set provisionalDataSource
+	to nil until after sending it locationChangeDone.
+
 2002-04-16  Darin Adler  <darin at apple.com>
 
 	* WebView.subproj/IFBaseWebController.mm: Remove special release handling because
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index de9b41f..5d209c7 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -302,11 +302,14 @@ static const char * const stateNames[6] = {
                 WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s:  checking complete, current state IFWEBFRAMESTATE_PROVISIONAL, %d errors\n", [[self name] cString], [[self errors] count]);
                 if (![[self provisionalDataSource] isLoading]) {
                     WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s:  checking complete in IFWEBFRAMESTATE_PROVISIONAL, load done\n", [[self name] cString]);
+
+                    [[[self provisionalDataSource] _locationChangeHandler] locationChangeDone: [self mainDocumentError]];
+
+
                     // We now the provisional data source didn't cut the mustard, release it.
                     [_private setProvisionalDataSource: nil];
                     
                     [self _setState: IFWEBFRAMESTATE_COMPLETE];
-                    [[[self provisionalDataSource] _locationChangeHandler] locationChangeDone: [self mainDocumentError]];
                     return;
                 }
             }
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index de9b41f..5d209c7 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -302,11 +302,14 @@ static const char * const stateNames[6] = {
                 WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s:  checking complete, current state IFWEBFRAMESTATE_PROVISIONAL, %d errors\n", [[self name] cString], [[self errors] count]);
                 if (![[self provisionalDataSource] isLoading]) {
                     WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s:  checking complete in IFWEBFRAMESTATE_PROVISIONAL, load done\n", [[self name] cString]);
+
+                    [[[self provisionalDataSource] _locationChangeHandler] locationChangeDone: [self mainDocumentError]];
+
+
                     // We now the provisional data source didn't cut the mustard, release it.
                     [_private setProvisionalDataSource: nil];
                     
                     [self _setState: IFWEBFRAMESTATE_COMPLETE];
-                    [[[self provisionalDataSource] _locationChangeHandler] locationChangeDone: [self mainDocumentError]];
                     return;
                 }
             }

-- 
WebKit Debian packaging