[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 70fd6d67cf35885e357ba2b4934833ce24393ad0
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 6 01:17:52 2003 +0000

            Reviewed by Ken.
    
            * WebView.subproj/WebFramePrivate.m:
            (_recursiveGoToItem:fromItem:withLoadType:): Account for
    	possibility of nil target.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3755 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fe1a368..c2f8c01 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2003-03-05  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Ken.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (_recursiveGoToItem:fromItem:withLoadType:): Account for
+	possibility of nil target.
+
+2003-03-05  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Darin.
 
 	- fixed crash when going back due to frame name of nil since we
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index f968534..4cc35f4 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1132,7 +1132,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     // The current frame tree and the frame tree snapshot in the item have to match.
     if (![item isTargetItem] &&
         [itemURL isEqual:currentURL] &&
-        [_private->name isEqualToString:[item target]] &&
+	(([self name] == nil && [item target] == nil) ||[[self name] isEqualToString:[item target]]) &&
         [self _childFramesMatchItem:item])
     {
         // This content is good, so leave it alone and look for children that need reloading

-- 
WebKit Debian packaging