Bug 554472 - Only sync prefs under extensions.weave.prefs.sync. (with a trailing dot) [r=mconnor]

Add a "." to the end of WEAVE_SYNC_PREFS value and fix up uses that did extra work to remove the dot (or something that might not have been a dot).
This commit is contained in:
Edward Lee 2010-03-23 18:51:47 -07:00
Родитель 7bf23a06a0
Коммит 9406f55ac2
1 изменённых файлов: 4 добавлений и 6 удалений

Просмотреть файл

@ -40,7 +40,7 @@ const Cc = Components.classes;
const Ci = Components.interfaces; const Ci = Components.interfaces;
const Cu = Components.utils; const Cu = Components.utils;
const WEAVE_SYNC_PREFS = "extensions.weave.prefs.sync"; const WEAVE_SYNC_PREFS = "extensions.weave.prefs.sync.";
const WEAVE_PREFS_GUID = "preferences"; const WEAVE_PREFS_GUID = "preferences";
Cu.import("resource://weave/util.js"); Cu.import("resource://weave/util.js");
@ -91,8 +91,7 @@ PrefStore.prototype = {
get _syncPrefs() { get _syncPrefs() {
let service = Cc["@mozilla.org/preferences-service;1"]. let service = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefService); getService(Ci.nsIPrefService);
let syncPrefs = service.getBranch(WEAVE_SYNC_PREFS).getChildList("", {}). let syncPrefs = service.getBranch(WEAVE_SYNC_PREFS).getChildList("", {});
map(function(elem) { return elem.substr(1); });
this.__defineGetter__("_syncPrefs", function() syncPrefs); this.__defineGetter__("_syncPrefs", function() syncPrefs);
return syncPrefs; return syncPrefs;
@ -104,7 +103,7 @@ PrefStore.prototype = {
let pref; let pref;
for (let i = 0; i < toSync.length; i++) { for (let i = 0; i < toSync.length; i++) {
if (!this._prefs.getBoolPref(WEAVE_SYNC_PREFS + "." + toSync[i])) if (!this._prefs.getBoolPref(WEAVE_SYNC_PREFS + toSync[i]))
continue; continue;
pref = {}; pref = {};
@ -230,8 +229,7 @@ PrefTracker.prototype = {
get _syncPrefs() { get _syncPrefs() {
let service = Cc["@mozilla.org/preferences-service;1"]. let service = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefService); getService(Ci.nsIPrefService);
let syncPrefs = service.getBranch(WEAVE_SYNC_PREFS).getChildList("", {}). let syncPrefs = service.getBranch(WEAVE_SYNC_PREFS).getChildList("", {});
map(function(elem) { return elem.substr(1); });
this.__defineGetter__("_syncPrefs", function() syncPrefs); this.__defineGetter__("_syncPrefs", function() syncPrefs);
return syncPrefs; return syncPrefs;