Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 157624 - prep for freezing nsISupports* primitives by renaming the string classes appropriately

Browse Source 
nsISupportsString  -> nsISupportsCString
nsISupportsWString -> nsISupportsString
r=dougt, sr=jag


git-svn-id: svn://10.0.0.236/trunk@197502 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com 2006-05-17 02:34:44 +00:00
parent 38f3e42997
commit de14687a8c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/suite/common/pref/pref-fonts.js
View File

@ -247,7 +247,7 @@ listElement.prototype =
var fontName;
while (aDataObject.hasMoreElements()) {
fontName = aDataObject.getNext();
fontName = fontName.QueryInterface(Components.interfaces.nsISupportsWString);
fontName = fontName.QueryInterface(Components.interfaces.nsISupportsString);
var fontNameStr = fontName.toString();
if (strDefaultFontFace == "")
strDefaultFontFace = fontNameStr;

8
mozilla/suite/common/pref/pref-history.xul
View File

@ -45,7 +45,7 @@
var pref = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
var lastUrl = pref.getComplexValue("general.open_location.last_url",
Components.interfaces.nsISupportsWString).data;
Components.interfaces.nsISupportsString).data;
urlbarHistButton.disabled = ( urlBarHist.count == 0 && !lastUrl ) || isBtnLocked ;
}
catch(ex) {
@ -74,11 +74,11 @@
urlBarHistory.clearHistory();
var pref = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
var str = Components.classes["@mozilla.org/supports-wstring;1"]
.createInstance(Components.interfaces.nsISupportsWString);
var str = Components.classes["@mozilla.org/supports-string;1"]
.createInstance(Components.interfaces.nsISupportsString);
str.data = "";
pref.setComplexValue("general.open_location.last_url",
Components.interfaces.nsISupportsWString,
Components.interfaces.nsISupportsString,
str);
}
]]>

10
mozilla/suite/common/pref/pref-themes.js
View File

@ -65,7 +65,7 @@ function Startup()
var theme = null;
try {
theme = kPrefSvc.getComplexValue("general.skins.selectedSkin",
Components.interfaces.nsISupportsWString).data;
Components.interfaces.nsISupportsString).data;
} catch (e) {
}
var matches;
@ -106,7 +106,7 @@ function applySkin()
var theme = null;
try {
theme = kPrefSvc.getComplexValue("general.skins.selectedSkin",
Components.interfaces.nsISupportsWString).data;
Components.interfaces.nsISupportsString).data;
} catch (e) {
}
@ -122,11 +122,11 @@ function applySkin()
var inUse = reg.isSkinSelected(data.name, true);
if (!theme && inUse == Components.interfaces.nsIChromeRegistry.FULL) return;
var str = Components.classes["@mozilla.org/supports-wstring;1"]
.createInstance(Components.interfaces.nsISupportsWString);
var str = Components.classes["@mozilla.org/supports-string;1"]
.createInstance(Components.interfaces.nsISupportsString);
str.data = data.name;
kPrefSvc.setComplexValue("general.skins.selectedSkin", Components.interfaces.nsISupportsWString, str);
kPrefSvc.setComplexValue("general.skins.selectedSkin", Components.interfaces.nsISupportsString, str);
// shut down quicklaunch so the next launch will have the new skin
var appShell = Components.classes['@mozilla.org/appshell/appShellService;1'].getService();