From 4249292cca3ad7b0cea9d2efacca40cdbf0976db Mon Sep 17 00:00:00 2001 From: "chanial%noos.fr" Date: Mon, 3 Nov 2003 08:14:10 +0000 Subject: [PATCH] bug 221599: remove comm.jar dependencies in nsGlobalHistory.cpp by adding history.properties for now. Putting the history in the toolkit seems highly bogus. --- browser/components/history/jar.mn | 1 - toolkit/components/history/jar.mn | 2 ++ .../components/history/locale/history.properties | 3 +-- toolkit/components/history/src/nsGlobalHistory.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 toolkit/components/history/jar.mn rename {browser => toolkit}/components/history/locale/history.properties (72%) diff --git a/browser/components/history/jar.mn b/browser/components/history/jar.mn index dc668cec8486..1872c827d03c 100644 --- a/browser/components/history/jar.mn +++ b/browser/components/history/jar.mn @@ -4,4 +4,3 @@ browser.jar: en-US.jar: locale/en-US/browser/history/history.dtd (locale/history.dtd) - locale/en-US/browser/history/history.properties (locale/history.properties) diff --git a/toolkit/components/history/jar.mn b/toolkit/components/history/jar.mn new file mode 100644 index 000000000000..ff4dbd923735 --- /dev/null +++ b/toolkit/components/history/jar.mn @@ -0,0 +1,2 @@ +en-US.jar: + locale/en-US/global/history/history.properties (locale/history.properties) diff --git a/browser/components/history/locale/history.properties b/toolkit/components/history/locale/history.properties similarity index 72% rename from browser/components/history/locale/history.properties rename to toolkit/components/history/locale/history.properties index ecb246f32438..3d72e368b283 100644 --- a/browser/components/history/locale/history.properties +++ b/toolkit/components/history/locale/history.properties @@ -10,5 +10,4 @@ finduri-AgeInDays-isgreater=Older than %S days finduri-Hostname-is-=(no host) -search_button_label=Find -search_results_title=Search Results +load-js-data-url-error=For security reasons, javascript or data urls cannot be loaded from the history window or sidebar. diff --git a/toolkit/components/history/src/nsGlobalHistory.cpp b/toolkit/components/history/src/nsGlobalHistory.cpp index 844f4490a8d6..4569571658ab 100644 --- a/toolkit/components/history/src/nsGlobalHistory.cpp +++ b/toolkit/components/history/src/nsGlobalHistory.cpp @@ -2392,7 +2392,7 @@ nsGlobalHistory::Init() do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv)) { - rv = bundleService->CreateBundle("chrome://communicator/locale/history/history.properties", getter_AddRefs(mBundle)); + rv = bundleService->CreateBundle("chrome://global/locale/history/history.properties", getter_AddRefs(mBundle)); } // register to observe profile changes