Index: browser/app/nsBrowserApp.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/app/nsBrowserApp.cpp,v retrieving revision 1.18 diff -p -u -8 -r1.18 nsBrowserApp.cpp --- browser/app/nsBrowserApp.cpp 7 Dec 2004 04:52:57 -0000 1.18 +++ browser/app/nsBrowserApp.cpp 21 Feb 2005 11:20:53 -0000 @@ -40,17 +40,17 @@ #ifdef XP_WIN #include #include #endif #include "nsBuildID.h" static const nsXREAppData kAppData = { "Mozilla", - "Firefox", + "Firefox Debug", APP_VERSION, BUILD_ID, // ec8030f7-c20a-464f-9b0e-13a3a9e97384 { 0xec8030f7, 0xc20a, 0x464f, { 0x9b, 0x0e, 0x13, 0xa3, 0xa9, 0xe9, 0x73, 0x84 } }, "Copyright (c) 2004 mozilla.org", NS_XRE_ENABLE_PROFILE_MIGRATOR | NS_XRE_ENABLE_EXTENSION_MANAGER }; Index: browser/app/profile/firefox.js =================================================================== RCS file: /cvsroot/mozilla/browser/app/profile/firefox.js,v retrieving revision 1.35 diff -p -u -8 -r1.35 firefox.js --- browser/app/profile/firefox.js 16 Dec 2004 09:10:23 -0000 1.35 +++ browser/app/profile/firefox.js 21 Feb 2005 11:20:54 -0000 @@ -227,20 +227,32 @@ pref("dom.disable_window_status_change", 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("privacy.item.history", true); +pref("privacy.item.formdata", true); +pref("privacy.item.passwords", false); +pref("privacy.item.downloads", true); +pref("privacy.item.cookies", false); +pref("privacy.item.cache", true); +pref("privacy.item.siteprefs", false); + +pref("privacy.sanitize.sanitizeOnShutdown", false); +pref("privacy.sanitize.promptOnSanitize", 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); +pref("network.cookie.denyRemovedCookies", false); // l12n and i18n pref("intl.accept_languages", "chrome://global/locale/intl.properties"); // collationOption is only set on linux for japanese. see bug 18338 and 62015 // we need to check if this pref is still useful. pref("intl.collationOption", "chrome://global-platform/locale/intl.properties"); pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties"); pref("intl.charsetmenu.browser.more1", "chrome://global/locale/intl.properties"); @@ -322,8 +334,23 @@ pref("accessibility.typeaheadfind.timeou 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"); + +#ifdef XP_WIN +pref("browser.preferences.instantApply", false); +#else +pref("browser.preferences.instantApply", true); +#endif +#ifdef XP_MACOSX +pref("browser.preferences.animateFadeIn", true); +#else +pref("browser.preferences.animateFadeIn", false); +#endif +pref("browser.display.screen_resolution", 96); + +pref("browser.download.show_plugins_in_list", true); +pref("browser.download.hide_plugins_without_extensions", true); Index: browser/base/jar.mn =================================================================== RCS file: /cvsroot/mozilla/browser/base/jar.mn,v retrieving revision 1.82 diff -p -u -8 -r1.82 jar.mn --- browser/base/jar.mn 30 Nov 2004 08:22:43 -0000 1.82 +++ browser/base/jar.mn 21 Feb 2005 11:20:54 -0000 @@ -19,15 +19,17 @@ browser.jar: content/browser/monitor.png (content/monitor.png) * content/browser/openLocation.js (content/openLocation.js) * content/browser/openLocation.xul (content/openLocation.xul) * content/browser/pageInfo.js (content/pageInfo.js) * content/browser/pageInfo.xul (content/pageInfo.xul) * content/browser/pageReport.js (content/pageReport.js) * content/browser/pageReport.xul (content/pageReport.xul) * content/browser/pageReportFirstTime.xul (content/pageReportFirstTime.xul) +* content/browser/sanitize.js (content/sanitize.js) +* content/browser/sanitize.xul (content/sanitize.xul) * content/browser/search.xml (content/search.xml) * content/browser/searchbarBindings.css (content/searchbarBindings.css) * content/browser/searchconfig.properties (content/searchconfig.properties) * content/browser/setWallpaper.xul (content/setWallpaper.xul) * content/browser/utilityOverlay.js (content/utilityOverlay.js) * content/browser/web-panels.js (content/web-panels.js) * content/browser/web-panels.xul (content/web-panels.xul) Index: browser/base/content/browser-menubar.inc =================================================================== RCS file: /cvsroot/mozilla/browser/base/content/browser-menubar.inc,v retrieving revision 1.42 diff -p -u -8 -r1.42 browser-menubar.inc --- browser/base/content/browser-menubar.inc 6 Feb 2005 17:42:55 -0000 1.42 +++ browser/base/content/browser-menubar.inc 21 Feb 2005 11:20:54 -0000 @@ -392,17 +392,20 @@ oncommand="toJavaScriptConsole();"/> #ifdef XP_WIN #else #endif - + + #ifndef XP_UNIX #else #ifdef XP_MACOSX Index: browser/base/content/browser-scripts.inc =================================================================== RCS file: /cvsroot/mozilla/browser/base/content/browser-scripts.inc,v retrieving revision 1.6 diff -p -u -8 -r1.6 browser-scripts.inc --- browser/base/content/browser-scripts.inc 1 Feb 2005 17:36:48 -0000 1.6 +++ browser/base/content/browser-scripts.inc 21 Feb 2005 11:20:55 -0000 @@ -43,8 +43,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: browser/components/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/browser/components/Makefile.in,v retrieving revision 1.36 diff -p -u -8 -r1.36 Makefile.in --- browser/components/Makefile.in 17 Jan 2005 18:50:08 -0000 1.36 +++ browser/components/Makefile.in 21 Feb 2005 11:21:00 -0000 @@ -53,16 +53,15 @@ EXTRA_PP_COMPONENTS = \ nsBrowserContentHandler.js \ $(NULL) DIRS = \ bookmarks \ help \ migration \ history \ - prefwindow \ + preferences \ shell \ sidebar \ - cookieviewer \ build \ $(NULL) include $(topsrcdir)/config/rules.mk Index: browser/components/cookieviewer/.cvsignore =================================================================== RCS file: browser/components/cookieviewer/.cvsignore diff -N browser/components/cookieviewer/.cvsignore --- browser/components/cookieviewer/.cvsignore 31 Jul 2003 02:21:21 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1 +0,0 @@ -Makefile Index: browser/components/cookieviewer/Makefile.in =================================================================== RCS file: browser/components/cookieviewer/Makefile.in diff -N browser/components/cookieviewer/Makefile.in --- browser/components/cookieviewer/Makefile.in 29 Sep 2003 06:03:44 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,45 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is the Mozilla Browser code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 2002 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Brian Ryner -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk Index: browser/components/cookieviewer/jar.mn =================================================================== RCS file: browser/components/cookieviewer/jar.mn diff -N browser/components/cookieviewer/jar.mn --- browser/components/cookieviewer/jar.mn 12 Jul 2004 17:15:03 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,6 +0,0 @@ -browser.jar: -* content/browser/cookieviewer/CookieViewer.xul (content/CookieViewer.xul) -* content/browser/cookieviewer/CookieViewer.js (content/CookieViewer.js) -* content/browser/cookieviewer/CookieExceptions.xul (content/CookieExceptions.xul) -* content/browser/cookieviewer/CookieExceptions.js (content/CookieExceptions.js) -* content/browser/cookieviewer/treeUtils.js (content/treeUtils.js) Index: browser/components/cookieviewer/content/CookieExceptions.js =================================================================== RCS file: browser/components/cookieviewer/content/CookieExceptions.js diff -N browser/components/cookieviewer/content/CookieExceptions.js --- browser/components/cookieviewer/content/CookieExceptions.js 28 Jan 2005 23:32:01 -0000 1.12 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,276 +0,0 @@ -const nsIPermissionManager = Components.interfaces.nsIPermissionManager; -const nsICookiePermission = Components.interfaces.nsICookiePermission; - -function Permission(id, host, rawHost, type, capability, perm) -{ - this.id = id; - this.host = host; - this.rawHost = rawHost; - this.type = type; - this.capability = capability; - this.perm = perm; -} - -var gPermissionManager = { - _type : "", - _addedPermissions : [], - _removedPermissions : [], - _pm : Components.classes["@mozilla.org/permissionmanager;1"] - .getService(Components.interfaces.nsIPermissionManager), - _bundle : null, - _tree : null, - - _view: { - _rowCount: 0, - get rowCount() - { - return this._rowCount; - }, - getCellText: function (aRow, aColumn) - { - if (aColumn.id == "siteCol") - return gPermissionManager._addedPermissions[aRow].rawHost; - else if (aColumn.id == "statusCol") - return gPermissionManager._addedPermissions[aRow].capability; - return ""; - }, - - isSeparator: function(aIndex) { return false; }, - isSorted: function() { return false; }, - isContainer: function(aIndex) { return false; }, - setTree: function(aTree){}, - getImageSrc: function(aRow, aColumn) {}, - getProgressMode: function(aRow, aColumn) {}, - getCellValue: function(aRow, aColumn) {}, - cycleHeader: function(column) {}, - getRowProperties: function(row,prop){}, - getColumnProperties: function(column,prop){}, - getCellProperties: function(row,column,prop){} - }, - - onOK: function () - { - var pm = Components.classes["@mozilla.org/permissionmanager;1"] - .getService(Components.interfaces.nsIPermissionManager); - for (var i = 0; i < this._removedPermissions.length; ++i) { - var p = this._removedPermissions[i]; - pm.remove(p.host, p.type); - } - - var uri = Components.classes["@mozilla.org/network/standard-url;1"] - .createInstance(Components.interfaces.nsIURI); - for (var i = 0; i < this._addedPermissions.length; ++i) { - var p = this._addedPermissions[i]; - uri.spec = p.host; - pm.add(uri, p.type, p.perm); - } - }, - - addPermission: function (aPermission) - { - var textbox = document.getElementById("url"); - var host = textbox.value.replace(/^\s*([-\w]*:\/+)?/, ""); // trim any leading space and scheme - try { - var ioService = Components.classes["@mozilla.org/network/io-service;1"] - .getService(Components.interfaces.nsIIOService); - var uri = ioService.newURI("http://"+host, null, null); - host = uri.host; - - // check for garbage - if (host == "" || host.replace(/\W/, "") == "") - throw("Error: Invalid hostname entered."); - } catch(ex) { - var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Components.interfaces.nsIPromptService); - var message = this._bundle.getString("invalidURI"); - var title = this._bundle.getString("invalidURITitle"); - promptService.alert(window, title, message); - - // clear out the textbox and disable the buttons - textbox.value = ""; - textbox.focus(); - this.onHostInput(textbox); - return; - } - - // we need this whether the perm exists or not - var stringKey = null; - switch (aPermission) { - case nsIPermissionManager.ALLOW_ACTION: - stringKey = "can"; - break; - case nsIPermissionManager.DENY_ACTION: - stringKey = "cannot"; - break; - case nsICookiePermission.ACCESS_SESSION: - stringKey = "canSession"; - break; - default: - break; - } - // check whether the permission already exists, if not, add it - var exists = false; - for (var i = 0; i < this._addedPermissions.length; ++i) { - if (this._addedPermissions[i].rawHost == host) { - exists = true; - this._addedPermissions[i].capability = this._bundle.getString(stringKey); - this._addedPermissions[i].perm = aPermission; - break; - } - } - - if (!exists) { - var p = new Permission(this._addedPermissions.length, - host, - (host.charAt(0) == ".") ? host.substring(1,host.length) : host, - this._type, - this._bundle.getString(stringKey), - aPermission); - this._addedPermissions.push(p); - - this._view._rowCount = this._addedPermissions.length; - this._tree.treeBoxObject.rowCountChanged(this._addedPermissions.length-1, 1); - this._tree.treeBoxObject.ensureRowIsVisible(this._addedPermissions.length-1); - } - textbox.value = ""; - textbox.focus(); - - // covers a case where the site exists already, so the buttons don't disable - this.onHostInput(textbox); - - // enable "remove all" button as needed - document.getElementById("removeAllPermissions").disabled = this._addedPermissions.length == 0; - }, - - onHostInput: function (aSiteField) - { - // trim any leading space - var site = aSiteField.value.replace(/^\s*([-\w]*:\/+)?/, ""); - - document.getElementById("btnSession").disabled = !site; - document.getElementById("btnBlock").disabled = !site; - document.getElementById("btnAllow").disabled = !site; - }, - - onLoad: function () - { - this._type = window.arguments[0].permissionType; - this._bundle = document.getElementById("permBundle"); - - var permissionsText = document.getElementById("permissionsText"); - while (permissionsText.hasChildNodes()) - permissionsText.removeChild(permissionsText.firstChild); - - var introString = this._bundle.getString(this._type + "permissionstext"); - permissionsText.appendChild(document.createTextNode(introString)); - - var titleString = this._bundle.getString(this._type + "permissionstitle"); - document.title = titleString; - - document.getElementById("btnBlock").hidden = !window.arguments[0].blockVisible; - document.getElementById("btnSession").hidden = !window.arguments[0].sessionVisible; - document.getElementById("btnAllow").hidden = !window.arguments[0].allowVisible; - document.getElementById("url").value = window.arguments[0].prefilledHost; - this.onHostInput(document.getElementById("url")); - - this._loadPermissions(); - }, - - onPermissionSelected: function () - { - var selections = GetTreeSelections(this._tree); - document.getElementById("removePermission").disabled = (selections.length < 1); - }, - - onPermissionDeleted: function () - { - DeleteSelectedItemFromTree(this._tree, this._view, - this._addedPermissions, this._removedPermissions, - "removePermission", "removeAllPermissions"); - }, - - onAllPermissionsDeleted: function () - { - DeleteAllFromTree(this._tree, this._view, - this._addedPermissions, this._removedPermissions, - "removePermission", "removeAllPermissions"); - }, - - onPermissionKeyPress: function (aEvent) - { - if (aEvent.keyCode == 46) - this.onPermissionDeleted(); - }, - - _lastPermissionSortColumn: "", - _lastPermissionSortAscending: false, - - onPermissionSort: function (aColumn, aUpdateSelection) - { - this._lastPermissionSortAscending = SortTree(this._tree, - this._view, - this._addedPermissions, - aColumn, - this._lastPermissionSortColumn, - this._lastPermissionSortAscending, - aUpdateSelection); - this._lastPermissionSortColumn = aColumn; - }, - - _loadPermissions: function () - { - this._tree = document.getElementById("permissionsTree"); - - // load permissions into a table - var count = 0; - var enumerator = this._pm.enumerator; - while (enumerator.hasMoreElements()) { - var nextPermission = enumerator.getNext().QueryInterface(Components.interfaces.nsIPermission); - if (nextPermission.type == this._type) { - var host = nextPermission.host; - var capability = null; - switch (nextPermission.capability) { - case nsIPermissionManager.ALLOW_ACTION: - capability = "can"; - break; - case nsIPermissionManager.DENY_ACTION: - capability = "cannot"; - break; - // we should only ever hit this for cookies - case nsICookiePermission.ACCESS_SESSION: - capability = "canSession"; - break; - default: - break; - } - var capabilityString = this._bundle.getString(capability); - var p = new Permission(count++, host, - (host.charAt(0) == ".") ? host.substring(1,host.length) : host, - nextPermission.type, - capabilityString, - nextPermission.capability); - this._addedPermissions.push(p); - } - } - - this._view._rowCount = this._addedPermissions.length; - - // sort and display the table - this._tree.treeBoxObject.view = this._view; - this.onPermissionSort("rawHost", false); - - // disable "remove all" button if there are none - document.getElementById("removeAllPermissions").disabled = this._addedPermissions.length == 0; - }, - - setHost: function (aHost) - { - document.getElementById("url").value = aHost; - } -}; - -function setHost(aHost) -{ - gPermissionManager.setHost(aHost); -} - Index: browser/components/cookieviewer/content/CookieExceptions.xul =================================================================== RCS file: browser/components/cookieviewer/content/CookieExceptions.xul diff -N browser/components/cookieviewer/content/CookieExceptions.xul --- browser/components/cookieviewer/content/CookieExceptions.xul 1 Feb 2005 17:36:49 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,96 +0,0 @@ - -# -*- Mode: SGML; indent-tabs-mode: nil -*- -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is Mozilla Communicator client code, released -# March 31, 1998. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998-1999 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Blake Ross (original author) -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - - - - - - - -