[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:42:12 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fbe791c2b1aded328b86f536a668ad5c91fa6c21
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed May 14 18:48:57 2003 +0000
WebFoundation:
Reviewed by Maciej
Copied WebLocalizableStrings.[hm] from WebFoundation to WebKit.
Renamed copy of WebLocalizableStrings.[hm] that stayed to NSURLLocalizableStrings.[hm]
Search and replace through all the code in this framework to
twiddle localizable string function names and macros
used and defined in the headers and implementation
files so that they use an "NSURL" prefix instead of no prefix,
a "Web" prefix, or a "WebFoundation" prefix.
Removed localizable strings exported symbols from exports file.
* AuthenticationManager.subproj/NSURLKeychainCredentialStorage.m:
(-[NSURLKeychainCredentialStorage _saveCredential:forProtectionSpace:isDefault:]):
* CacheLoader.subproj/NSURLResponse.m:
(+[NSHTTPURLResponse localizedStringForStatusCode:]):
* English.lproj/StringsNotToBeLocalized.txt:
* Misc.subproj/WebNSErrorExtras.m:
(WebNSErrorExtrasInit):
* Misc.subproj/WebNSStringExtras.m:
* Misc.subproj/WebNSURLExtras.m:
(-[NSURL _web_suggestedFilenameWithMIMEType:]):
* WebFoundation-base.exp:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by Maciej
Copied WebLocalizableStrings.[hm] from WebFoundation to WebKit
Updated all imports.
Added logging exported symbols to exports file.
* Misc.subproj/WebKitErrors.m:
* Misc.subproj/WebLocalizableStrings.h: Added.
* Misc.subproj/WebLocalizableStrings.m: Added.
* Panels.subproj/WebAuthenticationPanel.m:
* WebCoreSupport.subproj/WebBridge.m:
* WebCoreSupport.subproj/WebFileButton.m:
* WebCoreSupport.subproj/WebViewFactory.m:
* WebKit.exp:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
WebBrowser:
Reviewed by Maciej
Copied WebLocalizableStrings.[hm] from WebFoundation to WebKit.
Updated all imports.
* ABHomePagesController.m:
* AppController.m:
* BookmarksController.m:
* BookmarksRepresentation.m:
* BookmarksViewController.m:
* BrowserAddressBookExtras.m:
* BrowserDocument.m:
* BrowserDocumentController.m:
* BrowserNSErrorExtras.m:
* BrowserWebBookmarkExtras.m:
* BrowserWebController.m:
* BrowserWindowController.m:
* BugReportController.m:
* ContextMenuHandler.m:
* DateCell.m:
* DownloadMonitor.m:
* DownloadRow.m:
* DownloadViewController.m:
* DownloadWindowController.m:
* FavoriteButton.m:
* FindPanelController.m:
* FormCompletionController.m:
* FrameProgressEntry.m:
* GlobalHistory.m:
* HTMLSourceDocument.m:
* LoadProgressMonitor.m:
* LocationChangeError.m:
* LocationChangeHandler.m:
* Preferences.subproj/AcceptedCookies.m:
* Preferences.subproj/AdvancedPreferences.m:
* Preferences.subproj/AppearancePreferences.m:
* Preferences.subproj/AutoFillPreferences.m:
* Preferences.subproj/BookmarkPreferences.m:
* Preferences.subproj/DefaultBrowserController.m:
* Preferences.subproj/GeneralPreferences.m:
* Preferences.subproj/PasswordsEditor.m:
* Preferences.subproj/SecurityPreferences.m:
* Preferences.subproj/TabsPreferences.m:
* Preferences.subproj/WBPreferences.m:
* RendezvousController.m:
* ResourceProgressEntry.m:
* SearchTextField.m:
* ServicesProvider.m:
* WebSearchManager.m:
* main.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4372 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b93623b..3218e88 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,24 @@
+2003-05-14 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Maciej
+
+ Copied WebLocalizableStrings.[hm] from WebFoundation to WebKit
+
+ Updated all imports.
+
+ Added logging exported symbols to exports file.
+
+ * Misc.subproj/WebKitErrors.m:
+ * Misc.subproj/WebLocalizableStrings.h: Added.
+ * Misc.subproj/WebLocalizableStrings.m: Added.
+ * Panels.subproj/WebAuthenticationPanel.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebCoreSupport.subproj/WebFileButton.m:
+ * WebCoreSupport.subproj/WebViewFactory.m:
+ * WebKit.exp:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+
2003-05-14 Maciej Stachowiak <mjs at apple.com>
Reviewed by Don.
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index 2161b51..c4f676d 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -9,7 +9,7 @@
#import <WebKit/WebKitErrors.h>
-#import <WebFoundation/WebLocalizableStrings.h>
+#import <WebKit/WebLocalizableStrings.h>
#import <WebFoundation/WebNSErrorExtras.h>
#import <pthread.h>
diff --git a/WebKit/Misc.subproj/WebLocalizableStrings.h b/WebKit/Misc.subproj/WebLocalizableStrings.h
new file mode 100644
index 0000000..d3329df
--- /dev/null
+++ b/WebKit/Misc.subproj/WebLocalizableStrings.h
@@ -0,0 +1,29 @@
+/*
+ WebLocalizableStrings.h
+ Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+*/
+
+#import <Foundation/Foundation.h>
+
+typedef struct {
+ const char *identifier;
+ NSBundle *bundle;
+} WebLocalizableStringsBundle;
+
+NSString *WebLocalizedString(WebLocalizableStringsBundle *bundle, const char *key);
+
+#ifdef FRAMEWORK_NAME
+
+#define LOCALIZABLE_STRINGS_BUNDLE(F) LOCALIZABLE_STRINGS_BUNDLE_HELPER(F)
+#define LOCALIZABLE_STRINGS_BUNDLE_HELPER(F) F ## LocalizableStringsBundle
+extern WebLocalizableStringsBundle LOCALIZABLE_STRINGS_BUNDLE(FRAMEWORK_NAME);
+
+#define UI_STRING(string, comment) WebLocalizedString(&LOCALIZABLE_STRINGS_BUNDLE(FRAMEWORK_NAME), string)
+#define UI_STRING_KEY(string, key, comment) WebLocalizedString(&LOCALIZABLE_STRINGS_BUNDLE(FRAMEWORK_NAME), key)
+
+#else
+
+#define UI_STRING(string, comment) WebLocalizedString(0, string)
+#define UI_STRING_KEY(string, key, comment) WebLocalizedString(0, key)
+
+#endif
diff --git a/WebKit/Misc.subproj/WebLocalizableStrings.m b/WebKit/Misc.subproj/WebLocalizableStrings.m
new file mode 100644
index 0000000..9b8aeeb
--- /dev/null
+++ b/WebKit/Misc.subproj/WebLocalizableStrings.m
@@ -0,0 +1,36 @@
+/*
+ WebLocalizableStrings.m
+ Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+*/
+
+#import <WebKit/WebLocalizableStrings.h>
+
+#import <WebKit/WebAssertions.h>
+
+WebLocalizableStringsBundle WebKitLocalizableStringsBundle = { "com.apple.WebKit", 0 };
+
+NSString *WebLocalizedString(WebLocalizableStringsBundle *stringsBundle, const char *key)
+{
+ NSBundle *bundle;
+ if (stringsBundle == NULL) {
+ static NSBundle *mainBundle;
+ if (mainBundle == nil) {
+ mainBundle = [NSBundle mainBundle];
+ ASSERT(mainBundle);
+ }
+ bundle = mainBundle;
+ } else {
+ bundle = stringsBundle->bundle;
+ if (bundle == nil) {
+ bundle = [NSBundle bundleWithIdentifier:[NSString stringWithUTF8String:stringsBundle->identifier]];
+ ASSERT(bundle);
+ stringsBundle->bundle = bundle;
+ }
+ }
+ NSString *notFound = @"localized string not found";
+ CFStringRef keyString = CFStringCreateWithCStringNoCopy(NULL, key, kCFStringEncodingUTF8, kCFAllocatorNull);
+ NSString *result = [bundle localizedStringForKey:(NSString *)keyString value:notFound table:nil];
+ CFRelease(keyString);
+ ASSERT_WITH_MESSAGE(result != notFound, "could not find localizable string %s in bundle", key);
+ return result;
+}
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index c43c5f0..197aeeb 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -10,7 +10,7 @@
#import <WebFoundation/NSURLAuthenticationChallenge.h>
#import <WebFoundation/NSURLProtectionSpace.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebLocalizableStrings.h>
+#import <WebKit/WebLocalizableStrings.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebKit/WebNSControlExtras.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index d4cd197..6dad771 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -49,7 +49,7 @@
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebSystemBits.h>
#import <WebFoundation/WebFileTypeMappings.h>
-#import <WebFoundation/WebLocalizableStrings.h>
+#import <WebKit/WebLocalizableStrings.h>
@interface NSApplication (DeclarationStolenFromAppKit)
diff --git a/WebKit/WebCoreSupport.subproj/WebFileButton.m b/WebKit/WebCoreSupport.subproj/WebFileButton.m
index 19b38e8..06cbe22 100644
--- a/WebKit/WebCoreSupport.subproj/WebFileButton.m
+++ b/WebKit/WebCoreSupport.subproj/WebFileButton.m
@@ -9,7 +9,7 @@
#import "WebFileButton.h"
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebLocalizableStrings.h>
+#import <WebKit/WebLocalizableStrings.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebStringTruncator.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index be66d28..aed628c 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -9,7 +9,7 @@
#import <WebKit/WebViewFactory.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/WebLocalizableStrings.h>
+#import <WebKit/WebLocalizableStrings.h>
#import <WebKit/WebPluginDatabase.h>
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index a54a7ec..1d005a6 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -56,6 +56,7 @@ _WebIconSmallSize
_WebKitErrorMIMETypeKey
_WebKitErrorPlugInNameKey
_WebKitErrorPlugInPageURLStringKey
+_WebLocalizedString
_WebLog
_WebReportArgumentAssertionFailure
_WebReportAssertionFailure
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 00a01e9..acff374 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -293,6 +293,7 @@
515E27D10458CA4B00CA2D3A,
6578F5E0045F817400000128,
BEE18F940472A0CF00CA289C,
+ BEE18F9B0472B73200CA289C,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -326,7 +327,6 @@
394460A7020F50ED0ECA1767,
F528E3ED031E91AD01CA2ACA,
F5934C8B02E894F50197FBCF,
- 9367C637034E9F00008635C5,
93AEB180032C1735008635CE,
7082F572038EADAA00A80180,
F53444D102E87CBA018635CA,
@@ -406,6 +406,7 @@
515E27D20458CA4B00CA2D3A,
6578F5E1045F817400000128,
BEE18F950472A0CF00CA289C,
+ BEE18F9C0472B73200CA289C,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -483,10 +484,11 @@
F5927D4E02D26C5E01CA2DBB,
83730F9803FB1E660004736E,
84CA5F7E042685E800CA2ACA,
- 9367C636034E9F00008635C5,
7082F56F038EADAA00A80180,
7082F570038EADAA00A80180,
F5C283730284676D018635CA,
+ BEE18F990472B73200CA289C,
+ BEE18F9A0472B73200CA289C,
9345DDB20365FFD0008635CE,
9345DDB30365FFD0008635CE,
8398847A03426FB000BC5F5E,
@@ -2173,18 +2175,6 @@
settings = {
};
};
- 9367C636034E9F00008635C5 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebKitLocalizableStrings.m;
- refType = 4;
- };
- 9367C637034E9F00008635C5 = {
- fileRef = 9367C636034E9F00008635C5;
- isa = PBXBuildFile;
- settings = {
- };
- };
93AEB17D032C1735008635CE = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -2410,6 +2400,33 @@
settings = {
};
};
+ BEE18F990472B73200CA289C = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebLocalizableStrings.h;
+ refType = 4;
+ };
+ BEE18F9A0472B73200CA289C = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebLocalizableStrings.m;
+ refType = 4;
+ };
+ BEE18F9B0472B73200CA289C = {
+ fileRef = BEE18F990472B73200CA289C;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
+ BEE18F9C0472B73200CA289C = {
+ fileRef = BEE18F9A0472B73200CA289C;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
//BE0
//BE1
//BE2
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 42a0a8a..b481373 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -14,7 +14,7 @@
#import <WebKit/WebUIDelegate.h>
-#import <WebFoundation/WebLocalizableStrings.h>
+#import <WebKit/WebLocalizableStrings.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list