- link against libWebKitSystemInterface and use the first function in it.
* Misc.subproj/WebNSUserDefaultsExtras.m:
(-[NSString _webkit_HTTPStyleLanguageCode]): use WKCopyCFLocalizationPreferredName
* Plugins.subproj/WebBasePluginPackage.m:
(+[WebBasePluginPackage preferredLocalizationName]): ditto
* WebKit.pbproj/project.pbxproj: link in libWebKitSystemInterface.a and find headers.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9275
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2005-06-05 Maciej Stachowiak <mjs@apple.com>
+
+ Reviewed by Hyatt.
+
+ - link against libWebKitSystemInterface and use the first function in it.
+
+ * Misc.subproj/WebNSUserDefaultsExtras.m:
+ (-[NSString _webkit_HTTPStyleLanguageCode]): use WKCopyCFLocalizationPreferredName
+ * Plugins.subproj/WebBasePluginPackage.m:
+ (+[WebBasePluginPackage preferredLocalizationName]): ditto
+ * WebKit.pbproj/project.pbxproj: link in libWebKitSystemInterface.a and find headers.
+
2005-06-04 Darin Adler <darin@apple.com>
Reviewed by Don.
#import <WebKit/WebNSUserDefaultsExtras.h>
-#import <CoreFoundation/CFBundlePriv.h>
#import <WebKit/WebAssertions.h>
+#import <WebKitSystemInterface.h>
@implementation NSString (WebNSUserDefaultsPrivate)
{
// Look up the language code using CFBundle.
NSString *languageCode = self;
- SInt32 languageCodeNumber, regionCodeNumber;
- if (CFBundleGetLocalizationInfoForLocalization((CFStringRef)self, &languageCodeNumber, ®ionCodeNumber, NULL, NULL)) {
- CFStringRef shortName = CFMakeCollectable(CFBundleCopyLocalizationForLocalizationInfo(languageCodeNumber, regionCodeNumber, -1, 0xFFFF));
- if (shortName) {
- languageCode = [(id)shortName autorelease];
- }
- }
+ NSString *preferredLanguageCode = [(id)WKCopyCFLocalizationPreferredName((CFStringRef)self) autorelease];
+
+ if (preferredLanguageCode)
+ languageCode = preferredLanguageCode;
// Make the string lowercase.
NSString *lowercaseLanguageCode = [languageCode lowercaseString];
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebPluginPackage.h>
-#import <CoreFoundation/CFBundlePriv.h>
+#import <WebKitSystemInterface.h>
#define JavaCocoaPluginIdentifier @"com.apple.JavaPluginCocoa"
#define JavaCarbonPluginIdentifier @"com.apple.JavaAppletPlugin"
+ (NSString *)preferredLocalizationName
{
- SInt32 languageCode;
- SInt32 regionCode;
- SInt32 scriptCode;
- CFStringEncoding stringEncoding;
-
- CFBundleGetLocalizationInfoForLocalization(NULL, &languageCode, ®ionCode, &scriptCode, &stringEncoding);
- return WebCFAutorelease(CFBundleCopyLocalizationForLocalizationInfo(languageCode, regionCode, scriptCode, stringEncoding));
+ return WebCFAutorelease(WKCopyCFLocalizationPreferredName(NULL));
}
- (NSString *)pathByResolvingSymlinksAndAliasesInPath:(NSString *)thePath
830E81E005853AC000AD0891,
93D623DD051E791F002F47DD,
F738C9E903FAD3DF0321FBE0,
+ 65A0006808527D1A005620FA,
F738C9EA03FAD3DF0321FBE0,
);
isa = PBXGroup;
refType = 4;
sourceTree = "<group>";
};
+ 65A0006808527D1A005620FA = {
+ isa = PBXFileReference;
+ lastKnownFileType = archive.ar;
+ path = libWebKitSystemInterface.a;
+ refType = 3;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 65A0006908527D1A005620FA = {
+ fileRef = 65A0006808527D1A005620FA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
65A7D44A0568AB2600E70EF6 = {
fileEncoding = 30;
isa = PBXFileReference;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
- HEADER_SEARCH_PATHS = icu;
+ HEADER_SEARCH_PATHS = "$(SYMROOT)/usr/local/include icu";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /System/Library/Frameworks;
JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
9398112C0824BF01008DF038,
9398112E0824BF01008DF038,
9398112F0824BF01008DF038,
+ 65A0006908527D1A005620FA,
);
isa = PBXFrameworksBuildPhase;
runOnlyForDeploymentPostprocessing = 0;