diff --git a/mozilla/browser/EULA b/mozilla/browser/EULA new file mode 100644 index 00000000000..30c44bb590e --- /dev/null +++ b/mozilla/browser/EULA @@ -0,0 +1,18 @@ +FOR TRANSLATIONS OF THIS LICENSE INTO SELECTED LANGUAGES, PLEASE VISIT WWW.MOZILLA.ORG/LICENSING. + + MOZILLA FOUNDATION + MOZILLA FIREFOX END-USER SOFTWARE LICENSE AGREEMENT + +A SOURCE CODE VERSION OF CERTAIN FIREFOX BROWSER FUNCTIONALITY THAT YOU MAY USE, MODIFY AND DISTRIBUTE IS AVAILABLE TO YOU FREE-OF-CHARGE FROM WWW.MOZILLA.ORG UNDER THE MOZILLA PUBLIC LICENSE and other open source software licenses. +The accompanying executable code version of Mozilla Firefox and related documentation (the "Product") is made available to you under the terms of this MOZILLA FIREFOX END-USER SOFTWARE LICENSE AGREEMENT (THE "AGREEMENT"). BY CLICKING THE "ACCEPT" BUTTON, OR BY INSTALLING OR USING THE MOZILLA FIREFOX BROWSER, YOU ARE CONSENTING TO BE BOUND BY THE AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, DO NOT CLICK THE "ACCEPT" BUTTON, AND DO NOT INSTALL OR USE ANY PART OF THE MOZILLA FIREFOX BROWSER. +DURING THE MOZILLA FIREFOX INSTALLATION PROCESS, AND AT LATER TIMES, YOU MAY BE GIVEN THE OPTION OF INSTALLING ADDITIONAL COMPONENTS FROM THIRD-PARTY SOFTWARE PROVIDERS. THE INSTALLATION AND USE OF THOSE THIRD-PARTY COMPONENTS MAY BE GOVERNED BY ADDITIONAL LICENSE AGREEMENTS. +1. LICENSE GRANT. The Mozilla Foundation grants you a non-exclusive license to use the executable code version of the Product. This Agreement will also govern any software upgrades provided by Mozilla that replace and/or supplement the original Product, unless such upgrades are accompanied by a separate license, in which case the terms of that license will govern. +2. TERMINATION. If you breach this Agreement your right to use the Product will terminate immediately and without notice, but all provisions of this Agreement except the License Grant (Paragraph 1) will survive termination and continue in effect. Upon termination, you must destroy all copies of the Product. +3. PROPRIETARY RIGHTS. Portions of the Product are available in source code form under the terms of the Mozilla Public License and other open source licenses (collectively, "Open Source Licenses") at http://www.mozilla.org. Nothing in this Agreement will be construed to limit any rights granted under the Open Source Licenses. Subject to the foregoing, Mozilla, for itself and on behalf of its licensors, hereby reserves all intellectual property rights in the Product, except for the rights expressly granted in this Agreement. You may not remove or alter any trademark, logo, copyright or other proprietary notice in or on the Product. This license does not grant you any right to use the trademarks, service marks or logos of Mozilla or its licensors. +4. DISCLAIMER OF WARRANTY. THE PRODUCT IS PROVIDED "AS IS" WITH ALL FAULTS. TO THE EXTENT PERMITTED BY LAW, MOZILLA AND MOZILLA'S LICENSORS HEREBY DISCLAIM ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES THAT THE PRODUCT IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE AND NON-INFRINGING. YOU BEAR ENTIRE RISK AS TO SELECTING THE PRODUCT FOR YOUR PURPOSES AND AS TO THE QUALITY AND PERFORMANCE OF THE PRODUCT. THIS LIMITATION WILL APPLY NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF IMPLIED WARRANTIES, SO THIS DISCLAIMER MAY NOT APPLY TO YOU. +5. LIMITATION OF LIABILITY. EXCEPT AS REQUIRED BY LAW, MOZILLA AND ITS DIRECTORS, LICENSORS, CONTRIBUTORS AND AGENTS (COLLECTIVELY, THE "MOZILLA GROUP") WILL NOT BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES ARISING OUT OF OR IN ANY WAY RELATING TO THIS AGREEMENT OR THE USE OF OR INABILITY TO USE THE PRODUCT, INCLUDING WITHOUT LIMITATION DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOST PROFITS, LOSS OF DATA, AND COMPUTER FAILURE OR MALFUNCTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND REGARDLESS OF THE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH SUCH CLAIM IS BASED. THE MOZILLA GROUP'S COLLECTIVE LIABILITY UNDER THIS AGREEMENT WILL NOT EXCEED THE GREATER OF $500 (FIVE HUNDRED DOLLARS) AND THE FEES PAID BY YOU UNDER THIS LICENSE (IF ANY). SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL, CONSEQUENTIAL OR SPECIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. +6. EXPORT CONTROLS. This license is subject to all applicable export restrictions. You must comply with all export and import laws and restrictions and regulations of any United States or foreign agency or authority relating to the Product and its use. +7. U.S. GOVERNMENT END-USERS. The Product is a "commercial item," as that term is defined in 48 C.F.R. 2.101, consisting of "commercial computer software" and "commercial computer software documentation," as such terms are used in 48 C.F.R. 12.212 (Sept. 1995) and 48 C.F.R. 227.7202 (June 1995). Consistent with 48 C.F.R. 12.212, 48 C.F.R. 27.405(b)(2) (June 1998) and 48 C.F.R. 227.7202, all U.S. Government End Users acquire the Product with only those rights as set forth herein. +8. MISCELLANEOUS. (a) This Agreement constitutes the entire agreement between Mozilla and you concerning the subject matter hereof, and it may only be modified by a written amendment signed by an authorized executive of Mozilla. (b) Except to the extent applicable law, if any, provides otherwise, this Agreement will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. (c) This Agreement will not be governed by the United Nations Convention on Contracts for the International Sale of Goods. (d) If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties' original intent, and the remaining portions will remain in full force and effect. (e) A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. (f) Except as required by law, the controlling language of this Agreement is English. (g) You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms; the Mozilla Foundation may assign its rights under this Agreement without condition. (h) This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns. + + diff --git a/mozilla/browser/app/Makefile.in b/mozilla/browser/app/Makefile.in index 436f684236d..5eb6d2be6a5 100644 --- a/mozilla/browser/app/Makefile.in +++ b/mozilla/browser/app/Makefile.in @@ -44,7 +44,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = profile +DIRS = profile/extensions PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js @@ -158,7 +158,7 @@ endif ifdef DEBUG RCFLAGS += -DDEBUG endif -RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" +RCFLAGS += -DFIREFOX_ICO="$(DIST)/branding/firefox.ico" -DDOCUMENT_ICO="$(DIST)/branding/document.ico" endif include $(topsrcdir)/config/rules.mk @@ -262,9 +262,6 @@ install:: $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/icons endif -export:: brand.dtd.in - $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > brand.dtd - export:: ifndef MOZ_USE_OFFICIAL_BRANDING $(NSINSTALL) -D $(DIST)/branding @@ -275,6 +272,7 @@ ifeq ($(OS_ARCH),WINNT) endif ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) cp $(srcdir)/macbuild/firefox.icns $(DIST)/branding/firefox.icns + cp $(srcdir)/macbuild/document.icns $(DIST)/branding/document.icns endif ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm @@ -298,9 +296,18 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) APP_NAME = Firefox -libs:: $(PROGRAM) +AB_CD = $(MOZ_UI_LOCALE) + +AB := $(firstword $(subst -, ,$(AB_CD))) + +clean clobber repackage:: + rm -rf $(DIST)/$(APP_NAME).app + +libs repackage:: $(PROGRAM) mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS - rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app + rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj + mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj + rsync -a --exclude CVS $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj sed -e "s/APP_VERSION/$(APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS/mangle $(DIST)/$(APP_NAME).app/Contents/MacOS/shlibsign @@ -309,23 +316,19 @@ libs:: $(PROGRAM) cp -R $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins/ -cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign $(DIST)/$(APP_NAME).app/Contents/MacOS cp -RL $(DIST)/branding/firefox.icns $(DIST)/$(APP_NAME).app/Contents/Resources/firefox.icns + cp -RL $(DIST)/branding/document.icns $(DIST)/$(APP_NAME).app/Contents/Resources/document.icns cp -RL $(DIST)/package/mozillaSuite.rsrc $(DIST)/$(APP_NAME).app/Contents/Resources/$(PROGRAM).rsrc echo -n APPLMOZB > $(DIST)/$(APP_NAME).app/Contents/PkgInfo # remove CVS dirs from packaged app find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \; -clean clobber:: - rm -rf $(DIST)/$(APP_NAME).app endif -README_FILE = $(srcdir)/README.txt - libs:: - $(INSTALL) $(README_FILE) $(DIST)/bin $(INSTALL) $(topsrcdir)/LICENSE $(DIST)/bin libs:: $(srcdir)/profile/prefs.js $(INSTALL) $^ $(DIST)/bin/defaults/profile install:: $(srcdir)/profile/prefs.js - $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile + $(SYSINSTALL) $(IFLAGS1) $^ $(destdir)$(bindir)/defaults/profile diff --git a/mozilla/browser/app/module.ver b/mozilla/browser/app/module.ver index 96e7b971ce4..30bb74fa853 100644 --- a/mozilla/browser/app/module.ver +++ b/mozilla/browser/app/module.ver @@ -1,7 +1,7 @@ WIN32_MODULE_COMPANYNAME=Mozilla WIN32_MODULE_COPYRIGHT=©Firefox and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable. -WIN32_MODULE_FILEVERSION=0,8,0,0 -WIN32_MODULE_FILEVERSION_STRING=0.8 +WIN32_MODULE_FILEVERSION=1,0,0,0 +WIN32_MODULE_FILEVERSION_STRING=1.0 WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation. WIN32_MODULE_DESCRIPTION=Firefox WIN32_MODULE_PRODUCTNAME=Firefox diff --git a/mozilla/browser/app/mozilla.in b/mozilla/browser/app/mozilla.in index 25215f3d49c..9d946f4f100 100755 --- a/mozilla/browser/app/mozilla.in +++ b/mozilla/browser/app/mozilla.in @@ -16,7 +16,7 @@ # Reserved. # -## $Id: mozilla.in,v 1.9 2004-08-19 21:30:51 bryner%brianryner.com Exp $ +## $Id: mozilla.in,v 1.10 2004-11-30 08:22:42 ben%bengoodger.com Exp $ ## ## Usage: ## @@ -176,11 +176,9 @@ if [ $ALREADY_RUNNING -eq 1 ]; then # There were "some" command line args. if [ ${_USE_EXIST} -eq 1 ]; then # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 - _open_type="window" - #_open_type="tab" - _remote_cmd="openURL(${_optLast} , new-${_open_type})" + _remote_cmd="openURL(${_optLast})" "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" - unset _remote_cmd _open_type + unset _remote_cmd exit $? fi else diff --git a/mozilla/browser/app/nsBrowserApp.cpp b/mozilla/browser/app/nsBrowserApp.cpp index 404c34d5556..41ec9a1df44 100644 --- a/mozilla/browser/app/nsBrowserApp.cpp +++ b/mozilla/browser/app/nsBrowserApp.cpp @@ -45,7 +45,7 @@ static const nsXREAppData kAppData = { "Mozilla", - "Firefox", + "Firefox Debug", APP_VERSION, BUILD_ID, "Copyright (c) 2004 mozilla.org", diff --git a/mozilla/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in b/mozilla/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in index 4019e89fef5..580666907ee 100644 --- a/mozilla/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in +++ b/mozilla/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in @@ -12,8 +12,8 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} - 0.8 - 0.9 + 1.0 + 1.0 diff --git a/mozilla/browser/app/profile/firefox.js b/mozilla/browser/app/profile/firefox.js index 8fc77cac9f4..bc7159e4205 100644 --- a/mozilla/browser/app/profile/firefox.js +++ b/mozilla/browser/app/profile/firefox.js @@ -46,8 +46,10 @@ pref("general.startup.browser", true); pref("browser.chromeURL","chrome://browser/content/"); pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul"); pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul"); -pref("xpinstall.dialog.progress", "chrome://mozapps/content/downloads/downloads.xul"); -pref("xpinstall.dialog.progress.type", "Download:Manager"); +pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul?type=themes"); +pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul?type=extensions"); +pref("xpinstall.dialog.progress.type.skin", "Extension:Manager-themes"); +pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager-extensions"); // This is this application's unique identifier used by the Extension System to identify // this application as an extension target, and by the SmartUpdate system to identify @@ -55,7 +57,7 @@ pref("xpinstall.dialog.progress.type", "Download:Manager"); pref("app.id", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"); pref("app.version", @APP_VERSION@); pref("app.build_id", @BUILD_ID@); -pref("app.extensions.version", "0.9"); +pref("app.extensions.version", "1.0"); pref("update.app.enabled", true); // Whether or not app updates are enabled pref("update.app.url", "chrome://mozapps/locale/update/update.properties"); @@ -68,26 +70,51 @@ pref("update.extensions.wsdl", "chrome://mozapps/locale/extensions/extensions.pr pref("extensions.getMoreExtensionsURL", "chrome://mozapps/locale/extensions/extensions.properties"); pref("extensions.getMoreThemesURL", "chrome://mozapps/locale/extensions/extensions.properties"); -pref("update.extensions.autoUpdate", false); // Automatically download and install +// App-specific update preferences +pref("app.update.enabled", true); // Whether or not app updates are enabled +pref("app.update.autoUpdateEnabled", true); // Whether or not background app updates + // are enabled +pref("app.update.url", "chrome://mozapps/locale/update/update.properties"); +pref("app.update.updatesAvailable", false); +pref("app.update.interval", 86400000); // Check for updates to Firefox every day +pref("app.update.lastUpdateDate", 0); // UTC offset when last App update was + // performed. +pref("app.update.performed", false); // Whether or not an update has been + // performed this session. +// Symmetric (can be overridden by individual extensions) update preferences. +// e.g. +// extensions.{GUID}.update.enabled +// extensions.{GUID}.update.url +// extensions.{GUID}.update.interval +// .. etc .. +// +pref("extensions.update.enabled", true); +pref("extensions.update.autoUpdateEnabled", true); +pref("extensions.update.url", "chrome://mozapps/locale/extensions/extensions.properties"); +pref("extensions.update.autoUpdate", false); // Automatically download and install // updates to themes and extensions. // Does nothing at present. -pref("update.extensions.interval", 604800000); // Check for updates to Extensions and +pref("extensions.update.interval", 604800000); // Check for updates to Extensions and // Themes every week -pref("update.extensions.lastUpdateDate", 0); // UTC offset when last Extension/Theme +pref("extensions.update.lastUpdateDate", 0); // UTC offset when last Extension/Theme // update was performed. -pref("update.extensions.severity.threshold", 5);// The number of pending Extension/Theme +// Non-symmetric (not shared by extensions) extension-specific [update] preferences +pref("extensions.getMoreExtensionsURL", "chrome://mozapps/locale/extensions/extensions.properties"); +pref("extensions.getMoreThemesURL", "chrome://mozapps/locale/extensions/extensions.properties"); +pref("extensions.update.severity.threshold", 5);// The number of pending Extension/Theme // updates you can have before the update // notifier goes from low->medium severity. -pref("update.app.interval", 86400000); // Check for updates to Firefox every day -pref("update.app.lastUpdateDate", 0); // UTC offset when last App update was - // performed. +pref("extensions.update.count", 0); // The number of extension/theme/etc + // updates available +pref("extensions.dss.enabled", false); // Dynamic Skin Switching +pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. + +// General Update preferences pref("update.interval", 3600000); // Check each of the above intervals // every 60 mins pref("update.showSlidingNotification", true); // Windows-only slide-up taskbar // notification. -pref("update.app.performed", false); // Whether or not an update has been - // performed this session. - // These prefs relate to the number and severity of updates available. This is a // cache that the browser notification mechanism uses to determine if it should show // status bar UI if updates are detected and the app is shut down before installing @@ -96,8 +123,8 @@ pref("update.app.performed", false); // Whether or not an update has // 1 = medium (numerous extension/theme updates), // 2 = high (new version of Firefox/Security patch) pref("update.severity", 0); -// The number of extension/theme/etc updates available -pref("update.extensions.count", 0); + +pref("xpinstall.whitelist.add", "update.mozilla.org"); pref("keyword.enabled", true); pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q="); @@ -121,7 +148,11 @@ pref("browser.shell.checkDefaultBrowser", true); // 0 = blank, 1 = home (browser.startup.homepage), 2 = last // XXXBlake Remove this stupid pref pref("browser.startup.page", 1); -pref("browser.startup.homepage", "chrome://browser-region/locale/region.properties"); +pref("browser.startup.homepage", "resource:/browserconfig.properties"); + +// These values are deliberately non-localizable for official builds. +pref("browser.startup.homepage_reset", "resource:/browserconfig.properties"); +pref("browser.update.resetHomepage", false); // "browser.startup.homepage_override" was for 4.x pref("browser.startup.homepage_override.1", false); @@ -145,13 +176,18 @@ pref("browser.download.manager.focusWhenStarting", false); pref("browser.download.manager.flashCount", 2); // pointer to the default engine name -pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); // pointer to the Web Search url (content area context menu) -pref("browser.search.defaulturl", "chrome://browser-region/locale/region.properties"); - -pref("browser.search.param.Google.1.name", "chrome://browser/content/searchconfig.properties"); -pref("browser.search.param.Google.1.custom", "chrome://browser/content/searchconfig.properties"); +pref("browser.search.defaulturl", "chrome://browser-region/locale/region.properties"); +// Ordering of Search Engines in the Engine list. +pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); +pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); + pref("browser.search.param.Google.1.default", "chrome://browser/content/searchconfig.properties"); +pref("browser.search.param.Google.1.custom", "chrome://browser/content/searchconfig.properties"); +pref("browser.search.order.Yahoo.1", "chrome://browser/content/searchconfig.properties"); +pref("browser.search.order.Yahoo.2", "chrome://browser/content/searchconfig.properties"); +pref("browser.search.order.Yahoo", "chrome://browser/content/searchconfig.properties"); // basic search popup constraint: minimum sherlock plugin version displayed // (note: must be a string representation of a float or it'll default to 0.0) @@ -165,7 +201,10 @@ pref("browser.tabs.loadInBackground", true); pref("browser.tabs.loadFolderAndReplace", true); pref("browser.tabs.opentabfor.middleclick", true); pref("browser.tabs.opentabfor.urlbar", true); +pref("browser.tabs.loadDivertedInBackground", false); pref("browser.tabs.loadBookmarksInBackground", false); +// XXXben - Hide Single Window mode prefs for 1.0 to avoid crashes (see 266759) +pref("browser.tabs.showSingleWindowModePrefs", true); // Smart Browsing prefs pref("browser.related.enabled", true); @@ -179,17 +218,26 @@ pref("browser.bookmarks.sort.direction", "descending"); pref("browser.bookmarks.sort.resource", "rdf:http://home.netscape.com/NC-rdf#Name"); // Scripts & Windows prefs -pref("dom.disable_open_during_load", true); -pref("javascript.options.showInConsole", false); - -// Make the location bar reliably present and unaffected by pages -pref("dom.disable_window_open_feature.location", true); +pref("dom.disable_open_during_load", true); +pref("javascript.options.showInConsole", false); +/ Make the status bar reliably present and unaffected by pages +pref("dom.disable_window_open_feature.status", true); +// This is the pref to control the location bar, change this to true to +// force this instead of or in addition to the status bar - this makes +// the origin of popup windows more obvious to avoid spoofing but we +// cannot do it by default because it affects UE for web applications. +pref("dom.disable_window_open_feature.location", false); pref("dom.disable_window_status_change", true); + +pref("browser.trim_user_and_password", true); // popups.policy 1=allow,2=reject pref("privacy.popups.policy", 1); pref("privacy.popups.usecustom", true); pref("privacy.popups.firstTime", true); +pref("privacy.popups.showBrowserMessage", true); + +pref("network.proxy.share_proxy_settings", false); // use the same proxy settings for all protocols pref("network.cookie.cookieBehavior", 0); // cookies enabled pref("network.cookie.enableForCurrentSessionOnly", false); @@ -274,3 +322,13 @@ pref("browser.urlbar.clickSelectsAll", false); #endif #endif +pref("accessibility.typeaheadfind", false); +pref("accessibility.typeaheadfind.timeout", 5000); +pref("accessibility.typeaheadfind.linksonly", false); +pref("accessibility.typeaheadfind.flashBar", 1); + +// Disable the default plugin for firefox +pref("plugin.default_plugin_disabled", true); + +// plugin finder service +pref("pfs.datasource.url", "chrome://mozapps/locale/plugins/plugins.properties"); diff --git a/mozilla/browser/base/Makefile.in b/mozilla/browser/base/Makefile.in index 8f94eb6df4a..61c46142cd6 100644 --- a/mozilla/browser/base/Makefile.in +++ b/mozilla/browser/base/Makefile.in @@ -28,8 +28,22 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk +AB_CD = $(MOZ_UI_LOCALE) + +DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) + include $(topsrcdir)/config/rules.mk +DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID_UNQUOTED) + ifneq (,$(filter windows gtk2, $(MOZ_WIDGET_TOOLKIT))) DEFINES += -DHAVE_SHELL_SERVICE=1 endif + +libs locale:: + @$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + $(srcdir)/content/browserconfig.properties > $(DIST)/bin/browserconfig.properties + +install:: + @$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + $(srcdir)/content/browserconfig.properties > $(DESTDIR)$(mozappdir)/browserconfig.properties diff --git a/mozilla/browser/base/content/aboutDialog.js b/mozilla/browser/base/content/aboutDialog.js index 018aa2042bd..dcf30aa3584 100644 --- a/mozilla/browser/base/content/aboutDialog.js +++ b/mozilla/browser/base/content/aboutDialog.js @@ -65,7 +65,7 @@ function switchPage(aEvent) var iframe = document.getElementById("creditsIframe"); if (gSelectedPage == 0) { - iframe.setAttribute("src", "chrome://browser/locale/credits.html"); + iframe.setAttribute("src", "chrome://browser/content/credits.xhtml"); button.setAttribute("label", document.documentElement.getAttribute("aboutlabel")); gSelectedPage = 1; } diff --git a/mozilla/browser/base/content/aboutDialog.xul b/mozilla/browser/base/content/aboutDialog.xul index 1b983e3eb9a..57bea52eb4e 100644 --- a/mozilla/browser/base/content/aboutDialog.xul +++ b/mozilla/browser/base/content/aboutDialog.xul @@ -58,7 +58,11 @@ - - + diff --git a/mozilla/browser/base/content/browser-context.inc b/mozilla/browser/base/content/browser-context.inc index abdb78409ff..41f6577d85e 100644 --- a/mozilla/browser/base/content/browser-context.inc +++ b/mozilla/browser/base/content/browser-context.inc @@ -224,6 +224,14 @@ label="&metadataCmd.label;" accesskey="&metadataCmd.accesskey;" oncommand="gContextMenu.showMetadata();"/> +