зеркало из https://github.com/mozilla/gecko-dev.git
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:
Родитель
e05eafaa14
Коммит
d1e965d2ca
|
@ -420,7 +420,7 @@ nsHeaderSniffer.prototype = {
|
||||||
try {
|
try {
|
||||||
this.contentEncodingType =
|
this.contentEncodingType =
|
||||||
encodingEnumerator.getNext().
|
encodingEnumerator.getNext().
|
||||||
QueryInterface(Components.interfaces.nsISupportsString).data;
|
QueryInterface(Components.interfaces.nsISupportsCString).data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,7 +75,7 @@ function onLoad()
|
||||||
if (element)
|
if (element)
|
||||||
dialog.openAppList.selectedItem = element;
|
dialog.openAppList.selectedItem = element;
|
||||||
dialog.input.value = pref.getComplexValue("general.open_location.last_url",
|
dialog.input.value = pref.getComplexValue("general.open_location.last_url",
|
||||||
Components.interfaces.nsISupportsWString).data;
|
Components.interfaces.nsISupportsString).data;
|
||||||
}
|
}
|
||||||
catch(ex) {
|
catch(ex) {
|
||||||
}
|
}
|
||||||
|
@ -125,11 +125,11 @@ function open()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pref) {
|
if (pref) {
|
||||||
var str = Components.classes["@mozilla.org/supports-wstring;1"]
|
var str = Components.classes["@mozilla.org/supports-string;1"]
|
||||||
.createInstance(Components.interfaces.nsISupportsWString);
|
.createInstance(Components.interfaces.nsISupportsString);
|
||||||
str.data = dialog.input.value;
|
str.data = dialog.input.value;
|
||||||
pref.setComplexValue("general.open_location.last_url",
|
pref.setComplexValue("general.open_location.last_url",
|
||||||
Components.interfaces.nsISupportsWString, str);
|
Components.interfaces.nsISupportsString, str);
|
||||||
pref.setIntPref("general.open_location.last_window_choice", dialog.openAppList.value);
|
pref.setIntPref("general.open_location.last_window_choice", dialog.openAppList.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче