From 8653ef9412c4b10452fdd3acb86bd171c9ac7902 Mon Sep 17 00:00:00 2001 From: "neil%parkwaycc.co.uk" Date: Thu, 15 Jan 2004 21:24:08 +0000 Subject: [PATCH] Part of bug 230778 - remove @mozilla.org/preferences;1 from chrome r=caillon sr=jag --- .../content/pref-applications-edit.xul | 2 +- .../resources/content/pref-applications.js | 2 +- .../resources/content/pref-charset.js | 20 ++++++++++--------- .../resources/content/pref-fonts.js | 11 +--------- .../resources/content/pref-search.js | 10 +--------- .../resources/content/pref-smart_browsing.js | 12 +---------- .../resources/content/pref-themes.js | 15 +++++++------- 7 files changed, 24 insertions(+), 48 deletions(-) diff --git a/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul b/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul index 1d2935528727..a5ef292846dc 100644 --- a/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul +++ b/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul @@ -99,7 +99,7 @@ // Default to true in case the preference cannot be retrieved var forceAlwaysAsk = true; try { - var prefService = Components.classes["@mozilla.org/preferences;1"].getService(Components.interfaces.nsIPrefService); + var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService); var prefBranch = prefService.getBranch("browser.helperApps.alwaysAsk."); forceAlwaysAsk = prefBranch.getBoolPref("force"); } catch(e) { diff --git a/xpfe/components/prefwindow/resources/content/pref-applications.js b/xpfe/components/prefwindow/resources/content/pref-applications.js index 2797c46eb928..67e56879528f 100644 --- a/xpfe/components/prefwindow/resources/content/pref-applications.js +++ b/xpfe/components/prefwindow/resources/content/pref-applications.js @@ -89,7 +89,7 @@ const xmlSinkObserver = { // Convert old "don't ask" pref info to helper app pref entries try { - var prefService = Components.classes["@mozilla.org/preferences;1"].getService(Components.interfaces.nsIPrefService); + var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService); var prefBranch = prefService.getBranch("browser.helperApps.neverAsk."); if (!prefBranch) return; } catch(e) { return; } diff --git a/xpfe/components/prefwindow/resources/content/pref-charset.js b/xpfe/components/prefwindow/resources/content/pref-charset.js index 64636451b53b..ee1ffeba8829 100644 --- a/xpfe/components/prefwindow/resources/content/pref-charset.js +++ b/xpfe/components/prefwindow/resources/content/pref-charset.js @@ -1,8 +1,9 @@ //get prefInt services var availCharsetDict = []; -var prefInt = null; //Preferences Interface +var prefBranch = null; //Preferences Interface var pref_string_title = ""; +var pref_string_object = null; var pref_string_content = ""; function Init() @@ -12,11 +13,11 @@ function Init() if ("arguments" in window && window.arguments[0]) applicationArea = window.arguments[0]; - prefInt = Components.classes["@mozilla.org/preferences;1"]; - - if (prefInt) { - prefInt = prefInt.getService(Components.interfaces.nsIPref); + try { + prefBranch = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService).getBranch(null); + } catch (e) {} + if (prefBranch) { if (applicationArea == "mailedit") { pref_string_title = "intl.charsetmenu.mailedit"; } else { @@ -24,7 +25,8 @@ function Init() pref_string_title = "intl.charsetmenu.browser.static"; } - pref_string_content = prefInt.getLocalizedUnicharPref(pref_string_title); + pref_string_object = prefBranch.getComplexValue(pref_string_title, Components.interfaces.nsIPrefLocalizedString); + pref_string_content = pref_string_object.data; AddRemoveLatin1('add'); } @@ -286,9 +288,9 @@ function Save() try { - if (prefInt) { - prefInt.SetCharPref(pref_string_title, pref_string_content); - window.close(); + if (prefBranch) { + pref_string_object.data = pref_string_content; + prefBranch.setComplexValue(pref_string_title, Components.interfaces.nsIPrefLocalizedString, pref_string_object); } } catch(ex) { diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.js b/xpfe/components/prefwindow/resources/content/pref-fonts.js index 16bc64c67e5d..6f9669ab0613 100644 --- a/xpfe/components/prefwindow/resources/content/pref-fonts.js +++ b/xpfe/components/prefwindow/resources/content/pref-fonts.js @@ -37,15 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -try - { - var pref = Components.classes["@mozilla.org/preferences;1"].getService( Components.interfaces.nsIPref ); - } -catch(e) - { - dump("failed to get font list or pref object: "+e+" in pref-fonts.js\n"); - } - var fontEnumerator = null; var globalFonts = null; var fontTypes = ["serif", "sans-serif", "cursive", "fantasy", "monospace"]; @@ -575,7 +566,7 @@ function selectLanguage() try { var minSizePref = "font.minimum-size." + languageList.value; - minSizeVal = pref.GetIntPref( minSizePref ); + minSizeVal = parent.hPrefWindow.pref.GetIntPref( minSizePref ); } catch(e) { } minSizeSelect( minSizeVal ); diff --git a/xpfe/components/prefwindow/resources/content/pref-search.js b/xpfe/components/prefwindow/resources/content/pref-search.js index 546ee37cb525..c773940abdbb 100755 --- a/xpfe/components/prefwindow/resources/content/pref-search.js +++ b/xpfe/components/prefwindow/resources/content/pref-search.js @@ -34,15 +34,7 @@ function checkEngine() try { - var prefInt = null; //Preferences Interface - var strDefaultSearchEngineName; - - prefInt = Components.classes["@mozilla.org/preferences;1"]; - if (prefInt) - { - prefInt = prefInt.getService(Components.interfaces.nsIPref); - strDefaultSearchEngineName = prefInt.getLocalizedUnicharPref("browser.search.defaultenginename"); - } + var strDefaultSearchEngineName = parent.hPrefWindow.pref.getLocalizedUnicharPref("browser.search.defaultenginename"); var engineListSelection = engineList.getElementsByAttribute( "label", strDefaultSearchEngineName ); var selectedItem = engineListSelection.length ? engineListSelection[0] : null; diff --git a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.js b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.js index 92f41f26a22f..7daf4aac1b38 100644 --- a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.js +++ b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.js @@ -28,17 +28,7 @@ function moreInfo() var smartBrowsingURL = regionBundle.getString("smartBrowsingURL"); if (smartBrowsingURL) { try { - var prefs = Components.classes["@mozilla.org/preferences;1"]; - if (prefs) { - prefs = prefs.getService(); - if (prefs) - prefs = prefs.QueryInterface(Components.interfaces.nsIPref); - } - if (prefs) { - var url = prefs.CopyCharPref("browser.chromeURL"); - if (url) - browserURL = url; - } + browserURL = parent.hPrefWindow.pref.CopyCharPref("browser.chromeURL"); } catch(e) { } if (browserURL == null) diff --git a/xpfe/components/prefwindow/resources/content/pref-themes.js b/xpfe/components/prefwindow/resources/content/pref-themes.js index dc263e643653..2fbb991473cb 100644 --- a/xpfe/components/prefwindow/resources/content/pref-themes.js +++ b/xpfe/components/prefwindow/resources/content/pref-themes.js @@ -58,8 +58,8 @@ function Startup() gData.loaded = true; parent.hPrefWindow.registerOKCallbackFunc( applySkin ); - const kPrefSvcContractID = "@mozilla.org/preferences;1"; - const kPrefSvcIID = Components.interfaces.nsIPref; + const kPrefSvcContractID = "@mozilla.org/preferences-service;1"; + const kPrefSvcIID = Components.interfaces.nsIPrefService; const kPrefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID); var theme = null; @@ -101,8 +101,8 @@ function applySkin() if (data.name == null) return; - const kPrefSvcContractID = "@mozilla.org/preferences;1"; - const kPrefSvcIID = Components.interfaces.nsIPref; + const kPrefSvcContractID = "@mozilla.org/preferences-service;1"; + const kPrefSvcIID = Components.interfaces.nsIPrefService; const kPrefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID); var theme = null; @@ -208,10 +208,11 @@ function themeSelect() // XXX - this sucks and should only be temporary. var selectedSkin = ""; try { - const kPrefSvcContractID = "@mozilla.org/preferences;1"; - const kPrefSvcIID = Components.interfaces.nsIPref; + const kPrefSvcContractID = "@mozilla.org/preferences-service;1"; + const kPrefSvcIID = Components.interfaces.nsIPrefService; const kPrefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID); - selectedSkin = kPrefSvc.CopyCharPref("general.skins.selectedSkin"); + selectedSkin = kPrefSvc.getComplexValue("general.skins.selectedSkin", + Components.interfaces.nsISupportsString).data; } catch (e) { }