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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 4d63e1ecf81fffab83910735817a5d004fbb376a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 18 01:30:16 2003 +0000

    WebKit:
    
    	Fixed: 3160751 - Can't use non-'.txt' file extension for text files?
    
            Reviewed by mjs.
    
            * English.lproj/StringsNotToBeLocalized.txt:
            * Misc.subproj/WebNSURLResponseExtras.m:
            (-[NSURL _web_suggestedFilenameForSavingWithMIMEType:]): don't correct the file extension for plain text files
    
    WebBrowser:
    
    	Fixed: 3160751 - Can't use non-'.txt' file extension for text files?
    
            Reviewed by mjs
    
            * BrowserDocument.m:
            (-[BrowserDocument dataSourceToSave]): new
            (-[BrowserDocument isSavingPlainText]): new
            (-[BrowserDocument prepareSavePanel:]): newly implemented, make the save panel lenient about plain text
            (-[BrowserDocument panel:userEnteredFilename:confirmed:]): mimic TextEdit when saving plain text. If the extension ends in something other that ".txt", suggest appending ".txt"
            (-[BrowserDocument dataRepresentationOfType:]): call dataSourceToSave
            (-[BrowserDocument displayName]): call dataSourceToSave
            (-[BrowserDocument fileType]): call dataSourceToSave
            * English.lproj/Localizable.strings:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4138 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 95bd6a7..2b925fb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-17  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3160751 - Can't use non-'.txt' file extension for text files?
+
+        Reviewed by mjs.
+
+        * English.lproj/StringsNotToBeLocalized.txt:
+        * Misc.subproj/WebNSURLResponseExtras.m:
+        (-[NSURL _web_suggestedFilenameForSavingWithMIMEType:]): don't correct the file extension for plain text files
+
 2003-04-17  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3232332 -- History file should be versioned since 
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 3b206d8..854adf8 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -230,7 +230,9 @@
 "nullplugin"
 "text/"
 "text/calendar"
+"text/directory"
 "text/html"
+"text/plain"
 "text/qif"
 "text/rtf"
 "text/vcard"
diff --git a/WebKit/Misc.subproj/WebNSURLResponseExtras.m b/WebKit/Misc.subproj/WebNSURLResponseExtras.m
index 30180eb..ea6720d 100644
--- a/WebKit/Misc.subproj/WebNSURLResponseExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLResponseExtras.m
@@ -73,7 +73,7 @@
     }
 
     // If the type is known, check the extension and correct it if necessary.
-    if (MIMEType && ![MIMEType isEqualToString:@"application/octet-stream"]) {
+    if (MIMEType && ![MIMEType isEqualToString:@"application/octet-stream"] && ![MIMEType isEqualToString:@"text/plain"]) {
         WebFileTypeMappings *mappings = [WebFileTypeMappings sharedMappings];
         NSArray *extensions = [mappings extensionsForMIMEType:MIMEType];
 

-- 
WebKit Debian packaging