[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:57:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a6213f3a72097571beff59016f128f2a2ccd6e17
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 8 00:04:40 2002 +0000
* CacheLoader.subproj/IFURLCacheLoaderConstants.h:
Fixed two typos in constant names (not used anywhere).
* WebFoundation.pbproj/project.pbxproj: Jaguar/Puma
version wars.
First pass at adding error strings to IFError. They are
properly localized, but they don't include any parameters,
and the strings haven't been made user-friendly.
* Misc.subproj/IFError.m:
(+[IFError initialize]): New method, set up a dictionary
mapping error code to localized error string.
(-[IFError errorDescription]): Read string from dictionary.
* English.lproj/IFError.strings: New file, auto-generated
by the genstrings tool.
* WebKit.pbproj/project.pbxproj: Removed stray -F /symroots.
This shouldn't have been in there since symroots location is
no longer hardwired.
* BrowserDocument.m: (-[BrowserDocument locationChangeDone:forFrame:]):
Make error message include errorDescription. This is not final UI, have
no fear. Useful for debugging though.
* WebBrowser.pbproj/project.pbxproj: Jaguar/Puma version wars
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@716 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a044b2b..5899551 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,23 @@
2002-03-07 John Sullivan <sullivan at apple.com>
+ First pass at adding error strings to IFError. They are
+ properly localized, but they don't include any parameters,
+ and the strings haven't been made user-friendly.
+
+ * Misc.subproj/IFError.m:
+ (+[IFError initialize]): New method, set up a dictionary
+ mapping error code to localized error string.
+ (-[IFError errorDescription]): Read string from dictionary.
+
+ * English.lproj/IFError.strings: New file, auto-generated
+ by the genstrings tool.
+
+ * WebKit.pbproj/project.pbxproj: Removed stray -F /symroots.
+ This shouldn't have been in there since symroots location is
+ no longer hardwired.
+
+2002-03-07 John Sullivan <sullivan at apple.com>
+
Defined more symbolic debug-level constants; specified ranges for use by
different software levels (core/kit/client==browser) to enable easier
isolation of debug messages.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a044b2b..5899551 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,23 @@
2002-03-07 John Sullivan <sullivan at apple.com>
+ First pass at adding error strings to IFError. They are
+ properly localized, but they don't include any parameters,
+ and the strings haven't been made user-friendly.
+
+ * Misc.subproj/IFError.m:
+ (+[IFError initialize]): New method, set up a dictionary
+ mapping error code to localized error string.
+ (-[IFError errorDescription]): Read string from dictionary.
+
+ * English.lproj/IFError.strings: New file, auto-generated
+ by the genstrings tool.
+
+ * WebKit.pbproj/project.pbxproj: Removed stray -F /symroots.
+ This shouldn't have been in there since symroots location is
+ no longer hardwired.
+
+2002-03-07 John Sullivan <sullivan at apple.com>
+
Defined more symbolic debug-level constants; specified ranges for use by
different software levels (core/kit/client==browser) to enable easier
isolation of debug messages.
diff --git a/WebKit/English.lproj/IFError.strings b/WebKit/English.lproj/IFError.strings
new file mode 100644
index 0000000..52fd4e5
Binary files /dev/null and b/WebKit/English.lproj/IFError.strings differ
diff --git a/WebKit/English.lproj/WebError.strings b/WebKit/English.lproj/WebError.strings
new file mode 100644
index 0000000..52fd4e5
Binary files /dev/null and b/WebKit/English.lproj/WebError.strings differ
diff --git a/WebKit/Misc.subproj/IFError.m b/WebKit/Misc.subproj/IFError.m
index a399a91..2a52ea9 100644
--- a/WebKit/Misc.subproj/IFError.m
+++ b/WebKit/Misc.subproj/IFError.m
@@ -5,14 +5,116 @@
#import <IFError.h>
#include <WCError.h>
+#include <WebFoundation/IFURLCacheLoaderConstants.h>
+
@implementation IFError
+static NSDictionary *descriptions = nil;
+
static id IFErrorMake(int code)
{
return [[[IFError alloc] initWithErrorCode: (int)code] autorelease];
}
++(void) initialize
+{
+ NSDictionary *dict;
+
+ // +initialize is not thread-safe
+ if (descriptions != nil) {
+ return;
+ }
+
+ // Specifying all strings explicitly here, including table name, allows genstrings to work its magic
+ dict = [NSDictionary dictionaryWithObjectsAndKeys:
+ NSLocalizedStringFromTable (@"cancelled", @"IFError", @"IFURLHandleResultCancelled description"),
+ [NSNumber numberWithInt: IFURLHandleResultCancelled],
+ NSLocalizedStringFromTable (@"bad URL", @"IFError", @"IFURLHandleResultBadURLError description"),
+ [NSNumber numberWithInt: IFURLHandleResultBadURLError],
+ NSLocalizedStringFromTable (@"error requesting create", @"IFError", @"IFURLHandleResultRequestCreateError description"),
+ [NSNumber numberWithInt: IFURLHandleResultRequestCreateError],
+ NSLocalizedStringFromTable (@"error reading stream", @"IFError", @"IFURLHandleResultReadStreamError description"),
+ [NSNumber numberWithInt: IFURLHandleResultReadStreamError],
+ NSLocalizedStringFromTable (@"error creating read stream", @"IFError", @"IFURLHandleResultReadStreamCreateError description"),
+ [NSNumber numberWithInt: IFURLHandleResultReadStreamCreateError],
+ NSLocalizedStringFromTable (@"error setting client for read stream", @"IFError", @"IFURLHandleResultReadStreamSetClientError description"),
+ [NSNumber numberWithInt: IFURLHandleResultReadStreamSetClientError],
+ NSLocalizedStringFromTable (@"error opening read stream", @"IFError", @"IFURLHandleResultReadStreamOpenError description"),
+ [NSNumber numberWithInt: IFURLHandleResultReadStreamOpenError],
+ NSLocalizedStringFromTable (@"time out", @"IFError", @"IFURLHandleResultTimedOut description"),
+ [NSNumber numberWithInt: IFURLHandleResultTimedOut],
+ NSLocalizedStringFromTable (@"unsupported URL handle", @"IFError", @"IFURLHandleResultUnsupportedURLHandleError description"),
+ [NSNumber numberWithInt: IFURLHandleResultUnsupportedURLHandleError],
+ NSLocalizedStringFromTable (@"can't connect to host", @"IFError", @"IFURLHandleResultCantConnectToHostError description"),
+ [NSNumber numberWithInt: IFURLHandleResultCantConnectToHostError],
+ NSLocalizedStringFromTable (@"lost network connection", @"IFError", @"IFURLHandleResultNetworkConnectionLostError description"),
+ [NSNumber numberWithInt: IFURLHandleResultNetworkConnectionLostError],
+ NSLocalizedStringFromTable (@"DNS lookup error", @"IFError", @"IFURLHandleResultDNSLookupError description"),
+ [NSNumber numberWithInt: IFURLHandleResultDNSLookupError],
+ NSLocalizedStringFromTable (@"HTTP redirection loop error", @"IFError", @"IFURLHandleResultHTTPRedirectionLoopError description"),
+ [NSNumber numberWithInt: IFURLHandleResultHTTPRedirectionLoopError],
+ NSLocalizedStringFromTable (@"resource unvailable", @"IFError", @"IFURLHandleResultResourceUnavailableError description"),
+ [NSNumber numberWithInt: IFURLHandleResultResourceUnavailableError],
+ NSLocalizedStringFromTable (@"can't load from network", @"IFError", @"IFURLHandleResultCantLoadFromNetworkError description"),
+ [NSNumber numberWithInt: IFURLHandleResultCantLoadFromNetworkError],
+
+ NSLocalizedStringFromTable (@"bad request", @"IFError", @"IFURLHandleResultBadRequest description"),
+ [NSNumber numberWithInt: IFURLHandleResultBadRequest],
+ NSLocalizedStringFromTable (@"unauthorized", @"IFError", @"IFURLHandleResultUnauthorized description"),
+ [NSNumber numberWithInt: IFURLHandleResultUnauthorized],
+ NSLocalizedStringFromTable (@"payment required", @"IFError", @"IFURLHandleResultPaymentRequired description"),
+ [NSNumber numberWithInt: IFURLHandleResultPaymentRequired],
+ NSLocalizedStringFromTable (@"forbidden", @"IFError", @"IFURLHandleResultForbidden description"),
+ [NSNumber numberWithInt: IFURLHandleResultForbidden],
+ NSLocalizedStringFromTable (@"not found", @"IFError", @"IFURLHandleResultNotFound description"),
+ [NSNumber numberWithInt: IFURLHandleResultNotFound],
+ NSLocalizedStringFromTable (@"not allowed", @"IFError", @"IFURLHandleResultMethodNotAllowed description"),
+ [NSNumber numberWithInt: IFURLHandleResultMethodNotAllowed],
+ NSLocalizedStringFromTable (@"not acceptable", @"IFError", @"IFURLHandleResultNotAcceptable description"),
+ [NSNumber numberWithInt: IFURLHandleResultNotAcceptable],
+ NSLocalizedStringFromTable (@"not found", @"IFError", @"IFURLHandleResultNotFound description"),
+ [NSNumber numberWithInt: IFURLHandleResultNotFound],
+ NSLocalizedStringFromTable (@"proxy authentication required", @"IFError", @"IFURLHandleResultProxyAuthenticationRequired description"),
+ [NSNumber numberWithInt: IFURLHandleResultProxyAuthenticationRequired],
+ NSLocalizedStringFromTable (@"request time out", @"IFError", @"IFURLHandleResultRequestTimeOut description"),
+ [NSNumber numberWithInt: IFURLHandleResultRequestTimeOut],
+ NSLocalizedStringFromTable (@"conflict", @"IFError", @"IFURLHandleResultConflict description"),
+ [NSNumber numberWithInt: IFURLHandleResultConflict],
+ NSLocalizedStringFromTable (@"gone", @"IFError", @"IFURLHandleResultGone description"),
+ [NSNumber numberWithInt: IFURLHandleResultGone],
+ NSLocalizedStringFromTable (@"length required", @"IFError", @"IFURLHandleResultLengthRequired description"),
+ [NSNumber numberWithInt: IFURLHandleResultLengthRequired],
+ NSLocalizedStringFromTable (@"request entity too large", @"IFError", @"IFURLHandleResultRequestEntityTooLarge description"),
+ [NSNumber numberWithInt: IFURLHandleResultRequestEntityTooLarge],
+ NSLocalizedStringFromTable (@"request URI too large", @"IFError", @"IFURLHandleResultRequestURITooLarge description"),
+ [NSNumber numberWithInt: IFURLHandleResultRequestURITooLarge],
+ NSLocalizedStringFromTable (@"unsupported media type", @"IFError", @"IFURLHandleResultUnsupportedMediaType description"),
+ [NSNumber numberWithInt: IFURLHandleResultUnsupportedMediaType],
+ NSLocalizedStringFromTable (@"request range not satisfiable", @"IFError", @"IFURLHandleResultRequestRangeNotSatisfiable description"),
+ [NSNumber numberWithInt: IFURLHandleResultRequestRangeNotSatisfiable],
+ NSLocalizedStringFromTable (@"expectation failed", @"IFError", @"IFURLHandleResultExpectationFailed description"),
+ [NSNumber numberWithInt: IFURLHandleResultExpectationFailed],
+
+ NSLocalizedStringFromTable (@"internal server error", @"IFError", @"IFURLHandleResultInternalServerError description"),
+ [NSNumber numberWithInt: IFURLHandleResultInternalServerError],
+ NSLocalizedStringFromTable (@"not implemented", @"IFError", @"IFURLHandleResultNotImplemented description"),
+ [NSNumber numberWithInt: IFURLHandleResultNotImplemented],
+ NSLocalizedStringFromTable (@"bad gateway", @"IFError", @"IFURLHandleResultBadGateway description"),
+ [NSNumber numberWithInt: IFURLHandleResultBadGateway],
+ NSLocalizedStringFromTable (@"service unavailable", @"IFError", @"IFURLHandleResultServiceUnavailable description"),
+ [NSNumber numberWithInt: IFURLHandleResultServiceUnavailable],
+ NSLocalizedStringFromTable (@"gateway time out", @"IFError", @"IFURLHandleResultGatewayTimeOut description"),
+ [NSNumber numberWithInt: IFURLHandleResultGatewayTimeOut],
+ NSLocalizedStringFromTable (@"HTTP version not supported", @"IFError", @"IFURLHandleResultHTTPVersionNotSupported description"),
+ [NSNumber numberWithInt: IFURLHandleResultHTTPVersionNotSupported],
+ nil];
+
+ if (descriptions == nil) {
+ descriptions = [dict retain];
+ }
+}
+
+(void) load
{
WCSetIFErrorMakeFunc(IFErrorMake);
@@ -32,8 +134,8 @@ static id IFErrorMake(int code)
- (NSString *)errorDescription
{
- // FIXME!
- return nil;
+ NSLog(@"descriptions are %@", descriptions);
+ return [descriptions objectForKey: [NSNumber numberWithInt: errorCode]];
}
@end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 8044dac..bb5e779 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -119,7 +119,6 @@
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
- FRAMEWORK_SEARCH_PATHS = /symroots;
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = ../WebCore/include;
INSTALL_PATH = "";
@@ -203,6 +202,7 @@
089C1668FE841158C02AAC07,
35F3577501986B740ACA1520,
35F357800198AAB80ACA1520,
+ F515C2B90238249C01C1A525,
);
isa = PBXResourcesBuildPhase;
};
@@ -347,6 +347,7 @@
25A5593201A5996D0ECA149E,
F5DE3CB2023575AA01A80181,
F5DE3CB3023575AA01A80181,
+ F515C2B70238249C01C1A525,
);
isa = PBXGroup;
name = Misc;
@@ -1000,6 +1001,27 @@
settings = {
};
};
+ F515C2B70238249C01C1A525 = {
+ children = (
+ F515C2B80238249C01C1A525,
+ );
+ isa = PBXVariantGroup;
+ name = IFError.strings;
+ path = "";
+ refType = 4;
+ };
+ F515C2B80238249C01C1A525 = {
+ isa = PBXFileReference;
+ name = English;
+ path = English.lproj/IFError.strings;
+ refType = 4;
+ };
+ F515C2B90238249C01C1A525 = {
+ fileRef = F515C2B70238249C01C1A525;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F520FB190221DEFD01C1A525 = {
isa = PBXFileReference;
path = IFWebHistory.h;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list