From 9f064d92f39fe94135973f222a31a0ad917ff6e2 Mon Sep 17 00:00:00 2001 From: "db48x%yahoo.com" Date: Sun, 6 Aug 2006 06:33:49 +0000 Subject: [PATCH] bug 346760: shouldn't require type=unichar for non-ASCII prefs patch by Justin Wood (irc: Callek) , r=ben@mozilla.org --- toolkit/content/widgets/preferences.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/toolkit/content/widgets/preferences.xml b/toolkit/content/widgets/preferences.xml index 334e1bc0762..244e5a76689 100644 --- a/toolkit/content/widgets/preferences.xml +++ b/toolkit/content/widgets/preferences.xml @@ -279,12 +279,11 @@ case "bool": var val = this._branch.getBoolPref(this.name); return this.inverted ? !val : val; - case "string": - return this._branch.getCharPref(this.name); case "wstring": return this._branch .getComplexValue(this.name, Components.interfaces.nsIPrefLocalizedString) .data; + case "string": case "unichar": return this._branch .getComplexValue(this.name, Components.interfaces.nsISupportsString) @@ -314,9 +313,6 @@ case "bool": this.preferences.rootBranch.setBoolPref(this.name, this.inverted ? !val : val); break; - case "string": - this.preferences.rootBranch.setCharPref(this.name, val); - break; case "wstring": var pls = Components.classes["@mozilla.org/pref-localizedstring;1"] .createInstance(Components.interfaces.nsIPrefLocalizedString); @@ -324,6 +320,7 @@ this.preferences.rootBranch .setComplexValue(this.name, Components.interfaces.nsIPrefLocalizedString, pls); break; + case "string": case "unichar": var iss = Components.classes["@mozilla.org/supports-string;1"] .createInstance(Components.interfaces.nsISupportsString);