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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 5c7ee81ffe82118b48ab07df0fb41290bdce3000
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 7 15:56:45 2002 +0000

    	* Tools/Scripts/cvs-fix-patch: Tweak error handling a tiny bit,
    	make usage error go to stderr, and make it not touch the file if
    	dift -f doesn't end up fixing anything.
    
    	* Tools/Scripts/mv-if-different: Added. Useful to overwrite a file
    	with a new version without touching the mod date if they are equal.
    
    	* Tools/Scripts/set-alex-version: Use mv-if-different so we don't
    	touch files if we aren't changing anything.
    
    WebFoundation:
    
    	Use isEqualToString: instead of isEqual: more consistently. But only for strings.
    
    	* CacheLoader.subproj/IFHTTPURLProtocolHandler.m:
    	(+[IFHTTPURLProtocolHandler canonicalizeURL:]):
    
    WebKit:
    
    	Use isEqualToString: instead of isEqual: more consistently. But only for strings.
    
    	* WebCoreSupport.subproj/IFCachedTextRendererFactory.m:
    	(-[IFFontCacheKey isEqual:]):
    	* WebView.subproj/IFBaseWebController.mm:
    	(-[IFBaseWebController _frameNamed:fromFrame:]):
    
    WebBrowser:
    
    	Use isEqualToString: instead of isEqual: more consistently. But only for strings.
    
    	* AppController.m:
    	(-[AppController handleGURLEvent:withReplyEvent:]):
    	* BookmarksController.m:
    	(-[BookmarksController outlineView:objectValueForTableColumn:byItem:]):
    	(-[BookmarksController outlineView:setObjectValue:forTableColumn:byItem:]):
    	* BrowserWindow.m:
    	(-[BrowserWindow setLocationFieldText:]):
    	(-[BrowserWindow toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:]):
    	(-[BrowserWindow toolbarWillAddItem:]):
    	* Debug/DOMTree.mm:
    	(-[DOMTreeDataSource outlineView:objectValueForTableColumn:byItem:]):
    	* Debug/RenderTree.mm:
    	(-[RenderTreeDataSource outlineView:objectValueForTableColumn:byItem:]):
    	* LocationChangeHandler.m:
    	(-[LocationChangeHandler _saveScrollPosition]):
    	(-[LocationChangeHandler _restoreScrollPosition]):
    	* StopAndGoButton.m:
    	(-[StopAndGoButton setActiveImageSet:]):
    	* Test/PageLoadTestController.m:
    	(-[PageLoadTestController tableView:objectValueForTableColumn:row:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1104 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 98fb864..40df954 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-07  Darin Adler  <darin at apple.com>
+
+	Use isEqualToString: instead of isEqual: more consistently. But only for strings.
+
+	* WebCoreSupport.subproj/IFCachedTextRendererFactory.m:
+	(-[IFFontCacheKey isEqual:]):
+	* WebView.subproj/IFBaseWebController.mm:
+	(-[IFBaseWebController _frameNamed:fromFrame:]):
+
 2002-05-06  John Sullivan  <sullivan at apple.com>
 
 	Some improvements to the bookmark changed notifications.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 98fb864..40df954 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-05-07  Darin Adler  <darin at apple.com>
+
+	Use isEqualToString: instead of isEqual: more consistently. But only for strings.
+
+	* WebCoreSupport.subproj/IFCachedTextRendererFactory.m:
+	(-[IFFontCacheKey isEqual:]):
+	* WebView.subproj/IFBaseWebController.mm:
+	(-[IFBaseWebController _frameNamed:fromFrame:]):
+
 2002-05-06  John Sullivan  <sullivan at apple.com>
 
 	Some improvements to the bookmark changed notifications.
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.m
index cd9c1f0..e034e5d 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.m
@@ -52,7 +52,7 @@
 {
     IFFontCacheKey *other = o;
     return [self class] == [other class]
-        && [family isEqual:other->family]
+        && [family isEqualToString:other->family]
         && traits == other->traits
         && size == other->size;
 }
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index a5600f8..8aee991 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -209,7 +209,7 @@
 
 - (IFWebFrame *)_frameNamed: (NSString *)name fromFrame: (IFWebFrame *)frame
 {
-    if ([[frame name] isEqual: name])
+    if ([[frame name] isEqualToString: name])
         return frame;
 
     int i, count;

-- 
WebKit Debian packaging