[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 27fa8d4c93dfdf850f83cb4b4919ba8b6b0f1ab8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 19 20:19:04 2002 +0000

    WebKit:
    
            Reviewed by John.
    
    	- corrected the name of a method that was leading to trouble elsewhere
    
            * WebView.subproj/WebDataSource.h: Change fileType to fileExtension for clarity.
            * WebView.subproj/WebDataSource.m: (-[WebDataSource fileExtension]): Ditto.
    
    WebBrowser:
    
            Reviewed by John.
    
    	- fixed 3132671 -- REGRESSION: Saving an HTML file with Safari doesn't append .html (its used to)
    
            * BrowserDocument.m: (-[BrowserDocument fileType]): Call [NSDocumentController typeFromFileExtension:]
    	instead of using the extension as the file type, which only works if you happen to have a file type that's
    	named exactly the same as the extension.
            * HTMLSourceDocument.m: (-[HTMLSourceDocument fileType]): Ditto.
    
            * WebBrowser.pbproj/project.pbxproj: Added capitalized file types, fixed .jp2 to be separate from .jpg,
    	These came from looking over NSImage's file type list.
            * English.lproj/InfoPlist.strings: Added JPEG 2000.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3140 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 000fd36..e55f565 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-19  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- corrected the name of a method that was leading to trouble elsewhere
+
+        * WebView.subproj/WebDataSource.h: Change fileType to fileExtension for clarity.
+        * WebView.subproj/WebDataSource.m: (-[WebDataSource fileExtension]): Ditto.
+
 === Alexander-41 ===
 
 2002-12-19  Darin Adler  <darin at apple.com>
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 9419378..a1c088a 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -140,10 +140,10 @@
 - (NSString *)frameName;
 
 /*!
-    @method fileType
+    @method fileExtension
     @result The extension based on the MIME type 
 */
-- (NSString *)fileType;
+- (NSString *)fileExtension;
 
 /*!
     @method mainDocumentError
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 4c6de5a..f3e7fed 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -180,7 +180,7 @@
     return _private->pageTitle;
 }
 
-- (NSString *)fileType
+- (NSString *)fileExtension
 {
     return [[WebFileTypeMappings sharedMappings] preferredExtensionForMIMEType:[[self response] contentType]];
 }

-- 
WebKit Debian packaging