[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 ac4f296b68d5f5a6423cc410fe7b036de712a8c4
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 3 21:35:49 2002 +0000

    	Richard told me which line to change to fix 2944237
    	(Stop item in View menu enabled on startup if you have
    	no home page.)
    
    	* WebView.subproj/IFWebDataSource.mm:
    	(-[IFWebDataSource isLoading]):
    	Don't return YES if !_private->loading.
    
    	- fixed 2943189 -- Single-click to edit in Bookmarks window should
    	wait for double-click interval.
    
    	* OutlineViewPlus.h: new _startEditTimerOnMouseUp instance variable
    	* OutlineViewPlus.m:
    	(-[OutlineViewPlus _cancelEditOnMouseUp]):
    	clear _startEditTimerOnMouseUp as well as cancelling timer.
    
    	(-[OutlineViewPlus dragImageForRows:event:dragImageOffset:]):
    	clear _startEditTimerOnMouseUp variable.
    
    	(-[OutlineViewPlus mouseDown:]): Don't start timer until mouseUp,
    	since double-click interval is defined from mouseUp to mouseDown;
    	use _startEditTimerOnMouseUp variable beforehand so dragging can
    	cancel pending edit.
    
    	* BrowserDocument.m:
    	(-[BrowserDocument isLoading]): Tweaked this method while debugging
    	another problem; liked the new formulation better.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1255 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4254a65..1167ed1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-06-03  John Sullivan  <sullivan at apple.com>
+
+	Richard told me which line to change to fix 2944237
+	(Stop item in View menu enabled on startup if you have
+	no home page.)
+
+	* WebView.subproj/IFWebDataSource.mm:
+	(-[IFWebDataSource isLoading]):
+	Don't return YES if !_private->loading.
+
 2002-06-01  Darin Adler  <darin at apple.com>
 
 	* WebCoreSupport.subproj/IFImageRenderer.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4254a65..1167ed1 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-06-03  John Sullivan  <sullivan at apple.com>
+
+	Richard told me which line to change to fix 2944237
+	(Stop item in View menu enabled on startup if you have
+	no home page.)
+
+	* WebView.subproj/IFWebDataSource.mm:
+	(-[IFWebDataSource isLoading]):
+	Don't return YES if !_private->loading.
+
 2002-06-01  Darin Adler  <darin at apple.com>
 
 	* WebCoreSupport.subproj/IFImageRenderer.m:
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 5109e1e..611a193 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -210,7 +210,7 @@ static id IFWebDataSourceMake(void *url, void *attributes, unsigned flags)
         return NO;
         
     //WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self webFrame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
-    if (_private->primaryLoadComplete == NO)
+    if (_private->primaryLoadComplete == NO && _private->loading)
         return YES;
         
     if ([_private->urlHandles count])
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 5109e1e..611a193 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -210,7 +210,7 @@ static id IFWebDataSourceMake(void *url, void *attributes, unsigned flags)
         return NO;
         
     //WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self webFrame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
-    if (_private->primaryLoadComplete == NO)
+    if (_private->primaryLoadComplete == NO && _private->loading)
         return YES;
         
     if ([_private->urlHandles count])

-- 
WebKit Debian packaging