[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 a15075e329f7ef9d1ccca43f3405e382d81de817
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 15 02:47:37 2003 +0000

    	Reviewed by Dave.
    
            * Plugins.subproj/WebBaseNetscapePluginStream.m:
            (-[WebBaseNetscapePluginStream finishedLoadingWithData:]):
    	Fixed uninitialized variable warning so builds work again.
    
            * WebView.subproj/WebDataSourcePrivate.m: (+[WebDataSource _repTypes]): Added "application/xml".
            * WebView.subproj/WebViewPrivate.m: (+[WebView _viewTypes]): Added "application/xml".
    
    	* English.lproj/Localizable.strings: Regenerated.
    	* English.lproj/StringsNotToBeLocalized.txt: Updated for above change.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3323 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e2ad84b..7ea80b8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-01-14  Darin Adler  <darin at apple.com>
+
+	Reviewed by Dave.
+
+        * Plugins.subproj/WebBaseNetscapePluginStream.m:
+        (-[WebBaseNetscapePluginStream finishedLoadingWithData:]):
+	Fixed uninitialized variable warning so builds work again.
+
+        * WebView.subproj/WebDataSourcePrivate.m: (+[WebDataSource _repTypes]): Added "application/xml".
+        * WebView.subproj/WebViewPrivate.m: (+[WebView _viewTypes]): Added "application/xml".
+
+	* English.lproj/Localizable.strings: Regenerated.
+	* English.lproj/StringsNotToBeLocalized.txt: Updated for above change.
+
 2003-01-13  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey, John, and Maciej, and given the seal of approval by Don.
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 98c3b53..daa5e1c 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 14b4e79..4b6c733 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -38,6 +38,7 @@
 "Apple Chancery"
 "AppleFontSmoothing"
 "BufferTextDrawing"
+"Content-Disposition"
 "Courier"
 "DOCBASE"
 "DirectionAL"
@@ -214,6 +215,7 @@
 "application/x-java-applet"
 "application/x-javascript"
 "application/xhtml+xml"
+"application/xml"
 "audio/mp4"
 "com.apple.WebKit"
 "displayTitle"
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
index 502a2a5..b4a49ca 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
@@ -151,15 +151,15 @@
         }
         int dataLength = [data length];
         int byteCount = write(fd, [data bytes], dataLength);
-        int writeError = errno;
-        close(fd);
         if (byteCount != dataLength) {
             // This happens only rarely, when we are out of disk space or have a disk I/O error.
-            ERROR("error writing to temporary file, errno %d", writeError);
+            ERROR("error writing to temporary file, errno %d", errno);
+            close(fd);
             // This is not a network error, but the only error codes are "network error" and "user break".
             [self destroyStreamWithReason:NPRES_NETWORK_ERR];
             return;
         }
+        close(fd);
         
         NSString *carbonPath = [[NSFileManager defaultManager] _web_carbonPathForPath:[NSString stringWithCString:path]];
         NPP_StreamAsFile(instance, &stream, [carbonPath cString]);
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 5a62f98..db1210f 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -424,6 +424,7 @@
         repTypes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
             [WebHTMLRepresentation class], @"text/html",
 	    [WebHTMLRepresentation class], @"text/xml",
+	    [WebHTMLRepresentation class], @"application/xml",
 	    [WebHTMLRepresentation class], @"application/xhtml+xml",
             [WebTextRepresentation class], @"text/",
             [WebTextRepresentation class], @"application/x-javascript",
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 5fe84d2..006708c 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -244,6 +244,7 @@
         viewTypes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
             [WebHTMLView class], @"text/html",
 	    [WebHTMLView class], @"text/xml",
+	    [WebHTMLView class], @"application/xml",
 	    [WebHTMLView class], @"application/xhtml+xml",
             [WebTextView class], @"text/",
             [WebTextView class], @"application/x-javascript",

-- 
WebKit Debian packaging