[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 98b50229ef933bd80184d72cabc64a40c542dbec
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 4 22:50:19 2002 +0000

    2002-04-04  Chris Blumenberg  <cblu at apple.com>
    
            * English.lproj/IFError.strings:
            * Misc.subproj/IFError.h:
            * Misc.subproj/IFError.m: (+[IFError initialize]):
            * WebKit.pbproj/project.pbxproj:
            * WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
            IFURLHandle:resourceDataDidBecomeAvailable:]):
    
            Added the IFNonHTMLContentNotSupportedError to IFError.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@966 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a9b1101..18b759d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-04-04  Chris Blumenberg  <cblu at apple.com>
+
+	* English.lproj/IFError.strings:
+	* Misc.subproj/IFError.h:
+	* Misc.subproj/IFError.m: (+[IFError initialize]):
+	* WebKit.pbproj/project.pbxproj:
+	* WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+	IFURLHandle:resourceDataDidBecomeAvailable:]):
+
+	Added the IFNonHTMLContentNotSupportedError to IFError.
+
 2002-04-04  Richard Williamson  <rjw at apple.com>
 
         Tuned and re-enabled resource layouts.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a9b1101..18b759d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-04-04  Chris Blumenberg  <cblu at apple.com>
+
+	* English.lproj/IFError.strings:
+	* Misc.subproj/IFError.h:
+	* Misc.subproj/IFError.m: (+[IFError initialize]):
+	* WebKit.pbproj/project.pbxproj:
+	* WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+	IFURLHandle:resourceDataDidBecomeAvailable:]):
+
+	Added the IFNonHTMLContentNotSupportedError to IFError.
+
 2002-04-04  Richard Williamson  <rjw at apple.com>
 
         Tuned and re-enabled resource layouts.
diff --git a/WebKit/English.lproj/IFError.strings b/WebKit/English.lproj/IFError.strings
index 52fd4e5..ba6a065 100644
Binary files a/WebKit/English.lproj/IFError.strings and b/WebKit/English.lproj/IFError.strings differ
diff --git a/WebKit/English.lproj/WebError.strings b/WebKit/English.lproj/WebError.strings
index 52fd4e5..ba6a065 100644
Binary files a/WebKit/English.lproj/WebError.strings and b/WebKit/English.lproj/WebError.strings differ
diff --git a/WebKit/Misc.subproj/IFError.h b/WebKit/Misc.subproj/IFError.h
index 7feb3e7..bbc0147 100644
--- a/WebKit/Misc.subproj/IFError.h
+++ b/WebKit/Misc.subproj/IFError.h
@@ -6,6 +6,14 @@
 */
 #import <Foundation/Foundation.h>
 
+
+// WebFoundation error codes < 10000
+// WebKit error codes >= 10000
+
+typedef enum {
+    IFNonHTMLContentNotSupportedError = 10000
+} IFErrorCode;
+
 @interface IFError : NSObject
 {
     int errorCode;
diff --git a/WebKit/Misc.subproj/IFError.m b/WebKit/Misc.subproj/IFError.m
index cdc8c7f..4e5d4f4 100644
--- a/WebKit/Misc.subproj/IFError.m
+++ b/WebKit/Misc.subproj/IFError.m
@@ -108,6 +108,9 @@ static id IFErrorMake(int code)
         [NSNumber numberWithInt: IFURLHandleResultGatewayTimeOut],
         NSLocalizedStringFromTable (@"HTTP version not supported", @"IFError", @"IFURLHandleResultHTTPVersionNotSupported description"),
         [NSNumber numberWithInt: IFURLHandleResultHTTPVersionNotSupported],
+        
+        NSLocalizedStringFromTable (@"non-HTML content not currently supported", @"IFError", @"IFNonHTMLContentNotSupportedError description"),
+        [NSNumber numberWithInt: IFNonHTMLContentNotSupportedError],
         nil];
 
     if (descriptions == nil) {
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 7c1f6b9..27619c5 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1136,7 +1136,7 @@
 				DEBUG_CFLAGS = "";
 				FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
 				INSTALL_PATH = "@executable_path/../Frameworks";
-				OPTIMIZATION_CFLAGS = "";
+				OPTIMIZATION_CFLAGS = "-O0";
 				SKIP_INSTALL = YES;
 			};
 			isa = PBXBuildStyle;
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 48a8b05..c4cded0 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -69,7 +69,7 @@
     NSString *contentType = [sender contentType];
     if(![contentType isEqualToString:@"text/html"] && contentType != nil){
         [sender cancelLoadInBackground];
-        IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultUnsupportedMediaType failingURL: [sender url]];
+        IFError *error = [[IFError alloc] initWithErrorCode: IFNonHTMLContentNotSupportedError failingURL: [sender url]];
         [[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress:nil fromDataSource: dataSource];
         [error release];
         return;
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 48a8b05..c4cded0 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -69,7 +69,7 @@
     NSString *contentType = [sender contentType];
     if(![contentType isEqualToString:@"text/html"] && contentType != nil){
         [sender cancelLoadInBackground];
-        IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultUnsupportedMediaType failingURL: [sender url]];
+        IFError *error = [[IFError alloc] initWithErrorCode: IFNonHTMLContentNotSupportedError failingURL: [sender url]];
         [[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress:nil fromDataSource: dataSource];
         [error release];
         return;
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 48a8b05..c4cded0 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -69,7 +69,7 @@
     NSString *contentType = [sender contentType];
     if(![contentType isEqualToString:@"text/html"] && contentType != nil){
         [sender cancelLoadInBackground];
-        IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultUnsupportedMediaType failingURL: [sender url]];
+        IFError *error = [[IFError alloc] initWithErrorCode: IFNonHTMLContentNotSupportedError failingURL: [sender url]];
         [[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress:nil fromDataSource: dataSource];
         [error release];
         return;

-- 
WebKit Debian packaging