mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

nsISupportsString  -> nsISupportsCString
nsISupportsWString -> nsISupportsString
r=dougt, sr=jag
This commit is contained in:
alecf%netscape.com 2006-09-14 06:05:07 +00:00
Родитель 00e288788c
Коммит 428a9f7f94
2 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
suite/browser/navigator.js
Просмотреть файл

@ -1149,7 +1149,7 @@ function readFromClipboard()
trans.getTransferData("text/unicode", data, dataLen);
if (data) {
data = data.value.QueryInterface(Components.interfaces.nsISupportsWString);
data = data.value.QueryInterface(Components.interfaces.nsISupportsString);
url = data.data.substring(0, dataLen.value / 2);
}
} catch (ex) {
@ -1499,8 +1499,8 @@ function applyTheme(themeName)
catch(e) {
}
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);
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
if (oldTheme) {
@ -1518,7 +1518,7 @@ function applyTheme(themeName)
str.data = true;
pref.setComplexValue("general.skins.removelist." + name,
Components.interfaces.nsISupportsWString, str);
Components.interfaces.nsISupportsString, str);
if (inUse)
chromeRegistry.refreshSkins();
@ -1532,7 +1532,7 @@ function applyTheme(themeName)
// hacking around it yet again
str.data = name;
pref.setComplexValue("general.skins.selectedSkin", Components.interfaces.nsISupportsWString, str);
pref.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();

10
suite/browser/urlbarBindings.xml
Просмотреть файл

@ -215,11 +215,11 @@
var defaultEngine = null;
try {
defaultEngine = this.mPrefs.getComplexValue("browser.search.defaultengine",
Components.interfaces.nsISupportsWString).data;
Components.interfaces.nsISupportsString).data;
} catch(ex) {
this.ensureDefaultEnginePrefs(rdf, ds);
defaultEngine = this.mPrefs.getComplexValue("browser.search.defaultengine",
Components.interfaces.nsISupportsWString).data;
Components.interfaces.nsISupportsString).data;
}
if (defaultEngine) {
@ -258,11 +258,11 @@
var engineRes = arcs.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
var name = this.readRDFString(aDS, engineRes, kNC_Name);
if (name == defaultName) {
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 = engineRes.Value;
this.mPrefs.setComplexValue("browser.search.defaultengine",
Components.interfaces.nsISupportsWString,
Components.interfaces.nsISupportsString,
str);
}
}