diff --git a/mozilla/extensions/cck/browser/jar.mn b/mozilla/extensions/cck/browser/jar.mn index 2554224dcac..14c38f83cd5 100755 --- a/mozilla/extensions/cck/browser/jar.mn +++ b/mozilla/extensions/cck/browser/jar.mn @@ -23,3 +23,5 @@ cckwizard.jar: content/cckwizard/srcfiles/install.js.in (resources/content/cckwizard/srcfiles/install.js.in) content/cckwizard/srcfiles/install.rdf.in (resources/content/cckwizard/srcfiles/install.rdf.in) content/cckwizard/srcfiles/install.rdf.mip.in (resources/content/cckwizard/srcfiles/install.rdf.mip.in) + content/cckwizard/srcfiles/cck-config.css.in (resources/content/cckwizard/srcfiles/cck-config.css.in) + content/cckwizard/srcfiles/disableAboutConfig.js.in (resources/content/cckwizard/srcfiles/disableAboutConfig.js.in) diff --git a/mozilla/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd b/mozilla/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd index 70b05b40d8d..2347d43aff5 100755 --- a/mozilla/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd +++ b/mozilla/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd @@ -51,6 +51,8 @@ + + diff --git a/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.js b/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.js index f5528f9266d..4534664d681 100755 --- a/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.js +++ b/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.js @@ -822,6 +822,8 @@ function CreateCCK() CCKCopyFile(document.getElementById("LargeAnimPath").value, destdir); CCKCopyFile(document.getElementById("LargeStillPath").value, destdir); CCKCopyChromeToFile("cck.js", destdir) + if (document.getElementById("noaboutconfig").checked) + CCKCopyChromeToFile("cck-config.css", destdir) listbox = document.getElementById('certList'); @@ -868,6 +870,8 @@ function CreateCCK() } catch(ex) {} CCKCopyChromeToFile("cckService.js", destdir); + if (document.getElementById("noaboutconfig").checked) + CCKCopyChromeToFile("disableAboutConfig.js", destdir); /* ---------- */ @@ -2253,6 +2257,10 @@ function CCKReadConfigFile(srcdir) var locked = document.getElementById("locked"); locked.checked = configarray["locked"]; + + var aboutconfig = document.getElementById("noaboutconfig"); + aboutconfig.checked = configarray["noaboutconfig"]; + var proxyitem = document.getElementById("shareAllProxies"); proxyitem.checked = configarray["shareAllProxies"]; diff --git a/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul b/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul index 6d83bf669b5..ceda9a92982 100755 --- a/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul +++ b/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul @@ -188,6 +188,13 @@ + + + + + + + diff --git a/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cck-config.css.in b/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cck-config.css.in new file mode 100644 index 00000000000..3679b768b17 --- /dev/null +++ b/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cck-config.css.in @@ -0,0 +1 @@ +* {display:none} diff --git a/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/chrome.manifest.in b/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/chrome.manifest.in index 9c24b9cf627..738f26ea3a9 100755 --- a/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/chrome.manifest.in +++ b/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/chrome.manifest.in @@ -1,2 +1,3 @@ -overlay chrome://browser/content/browser.xul chrome://cck/content/cck-browser-overlay.xul +overlay chrome://browser/content/browser.xul chrome://cck/content/cck-browser-overlay.xul +style chrome://global/content/config.xul chrome://cck/content/cck-config.css content cck jar:chrome/cck.jar!/content/cck/ diff --git a/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/disableAboutConfig.js.in b/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/disableAboutConfig.js.in new file mode 100644 index 00000000000..e726e5a1c80 --- /dev/null +++ b/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/disableAboutConfig.js.in @@ -0,0 +1,124 @@ +/* ***** 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 a service disables about:config. + * + * The Initial Developer of the Original Code is IBM Corp. + * Portions created by the Initial Developer are Copyright (C) 2005 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * 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 ***** */ + +const ABOUT_CONFIG_CONTRACTID = "@mozilla.org/network/protocol/about;1?what=config"; +const NS_ABOUT_REDIRECTOR_MODULE_CID = Components.ID('{f0acde16-1dd1-11b2-9e35-f5786fff5a66}'); + +const nsIAboutModule = Components.interfaces.nsIAboutModule; + +function AboutHandler() {} +AboutHandler.prototype = +{ + /* nsISupports */ + QueryInterface : function handler_QI(iid) { + if (iid.equals(Components.interfaces.nsISupports)) + return this; + + if (nsIAboutModule && iid.equals(nsIAboutModule)) + return this; + + throw Components.results.NS_ERROR_NO_INTERFACE; + }, + + /* nsIAboutModule */ + newChannel : function newChannel(aURI) { + var ioService = Components.classes["@mozilla.org/network/io-service;1"].getService(); + ioService = ioService.QueryInterface(Components.interfaces.nsIIOService); + var uri_str = "data:text/html,

about:config has been disabled

"; + var ext_uri = ioService.newURI(uri_str, null, null); + var ext_channel = ioService.newChannelFromURI(ext_uri); + return ext_channel; + } +}; + + +var AboutFactory = +{ + createInstance : function(outer, iid) + { + if (outer != null) { + throw Components.results.NS_ERROR_NO_AGGREGATION; + } + + return new AboutHandler().QueryInterface(iid); + } +}; + + +var AboutModule = +{ + registerSelf : function(compMgr, fileSpec, location, type) + { + compMgr = compMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar); + + compMgr.registerFactoryLocation(NS_ABOUT_REDIRECTOR_MODULE_CID, + "about:config", + ABOUT_CONFIG_CONTRACTID, + fileSpec, + location, + type); + }, + + unregisterSelf : function(compMgr, fileSpec, location) + { + compMgr = compMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar); + + compMgr.unregisterFactoryLocation(NS_ABOUT_REDIRECTOR_MODULE_CID, fileSpec); + }, + + getClassObject : function(compMgr, cid, iid) + { + if (cid.equals(NS_ABOUT_REDIRECTOR_MODULE_CID)) { + return AboutFactory; + } + + if (!iid.equals(Components.interfaces.nsIFactory)) { + throw Components.results.NS_ERROR_NOT_IMPLEMENTED; + } + + throw Components.results.NS_ERROR_NO_INTERFACE; + }, + + canUnload : function(compMgr) + { + return true; + } +}; + + +function NSGetModule(compMgr, fileSpec) { + return AboutModule; +} +