зеркало из https://github.com/mozilla/gecko-dev.git
bug 346760: shouldn't require type=unichar for non-ASCII prefs
patch by Justin Wood (irc: Callek) <bugspam.Callek@gmail.com>, r=ben@mozilla.org
This commit is contained in:
Родитель
1887388365
Коммит
d80b165826
|
@ -279,12 +279,11 @@
|
||||||
case "bool":
|
case "bool":
|
||||||
var val = this._branch.getBoolPref(this.name);
|
var val = this._branch.getBoolPref(this.name);
|
||||||
return this.inverted ? !val : val;
|
return this.inverted ? !val : val;
|
||||||
case "string":
|
|
||||||
return this._branch.getCharPref(this.name);
|
|
||||||
case "wstring":
|
case "wstring":
|
||||||
return this._branch
|
return this._branch
|
||||||
.getComplexValue(this.name, Components.interfaces.nsIPrefLocalizedString)
|
.getComplexValue(this.name, Components.interfaces.nsIPrefLocalizedString)
|
||||||
.data;
|
.data;
|
||||||
|
case "string":
|
||||||
case "unichar":
|
case "unichar":
|
||||||
return this._branch
|
return this._branch
|
||||||
.getComplexValue(this.name, Components.interfaces.nsISupportsString)
|
.getComplexValue(this.name, Components.interfaces.nsISupportsString)
|
||||||
|
@ -314,9 +313,6 @@
|
||||||
case "bool":
|
case "bool":
|
||||||
this.preferences.rootBranch.setBoolPref(this.name, this.inverted ? !val : val);
|
this.preferences.rootBranch.setBoolPref(this.name, this.inverted ? !val : val);
|
||||||
break;
|
break;
|
||||||
case "string":
|
|
||||||
this.preferences.rootBranch.setCharPref(this.name, val);
|
|
||||||
break;
|
|
||||||
case "wstring":
|
case "wstring":
|
||||||
var pls = Components.classes["@mozilla.org/pref-localizedstring;1"]
|
var pls = Components.classes["@mozilla.org/pref-localizedstring;1"]
|
||||||
.createInstance(Components.interfaces.nsIPrefLocalizedString);
|
.createInstance(Components.interfaces.nsIPrefLocalizedString);
|
||||||
|
@ -324,6 +320,7 @@
|
||||||
this.preferences.rootBranch
|
this.preferences.rootBranch
|
||||||
.setComplexValue(this.name, Components.interfaces.nsIPrefLocalizedString, pls);
|
.setComplexValue(this.name, Components.interfaces.nsIPrefLocalizedString, pls);
|
||||||
break;
|
break;
|
||||||
|
case "string":
|
||||||
case "unichar":
|
case "unichar":
|
||||||
var iss = Components.classes["@mozilla.org/supports-string;1"]
|
var iss = Components.classes["@mozilla.org/supports-string;1"]
|
||||||
.createInstance(Components.interfaces.nsISupportsString);
|
.createInstance(Components.interfaces.nsISupportsString);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче