dateFormat.js: var pref = Components.classes["@mozilla.org/preferences-service;1"] folderProps.js: var prefs = Components.classes["@mozilla.org/preferences-service;1"] junkCommands.js: Components.classes["@mozilla.org/messenger/messagecopyservice;1"] junkCommands.js: var junkService = Components.classes["@mozilla.org/messenger/filter-plugin;1?name=bayesianfilter"] junkCommands.js: var junkService = Components.classes["@mozilla.org/messenger/filter-plugin;1?name=bayesianfilter"] junkLog.js: var directoryService = Components.classes["@mozilla.org/file/directory_service;1"] junkLog.js: ioService = Components.classes["@mozilla.org/network/io-service;1"] msgPrintEngine.js: var strBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]. msgSynchronize.js: var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch); msgSynchronize.js: var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch); virtualFolderListDialog.js: var accountManager = Components.classes["@mozilla.org/messenger/account-manager;1"].getService(Components.interfaces.nsIMsgAccountManager); virtualFolderListDialog.js: var accountManager = Components.classes["@mozilla.org/messenger/account-manager;1"].getService(Components.interfaces.nsIMsgAccountManager); virtualFolderProperties.js: Components.classes["@mozilla.org/embedcomp/prompt-service;1"] virtualFolderProperties.js: var accountManager = Components.classes["@mozilla.org/messenger/account-manager;1"].getService(Components.interfaces.nsIMsgAccountManager); virtualFolderProperties.js: Components.classes["@mozilla.org/embedcomp/prompt-service;1"] virtualFolderProperties.js: Components.classes["@mozilla.org/embedcomp/prompt-service;1"]

I came across a JS strict warning about "redefining 'arguments'" in these files so I add it here too.

Comment on attachment 627581 [details] [diff] [review] patch v2 Busy this week, so passing review over.

Comment on attachment 627581 [details] [diff] [review] patch v2 Review of attachment 627581 [details] [diff] [review]: ----------------------------------------------------------------- Just two nits. r=me with that fixed. ::: mail/components/preferences/junkLog.js @@ +35,5 @@ > # the terms of any one of the MPL, the GPL or the LGPL. > # > # ***** END LICENSE BLOCK ***** > > +// TODO: is it possible to merge this with /mailnews/base/content/junkLog.* ? Instead of burying this as a TODO in the source, you should file a bug instead. ::: mailnews/base/content/dateFormat.js @@ +139,5 @@ > > + gSearchDateLeadingZeros = > + (Services.prefs.getComplexValue("mailnews.search_date_leading_zeros", > + Components.interfaces.nsIPrefLocalizedString) > + .data == "true"); I'm not wild about the formatting of lines 140-143... not sure how best to clean it up, beyond breaking it up over a couple of statements.

Thanks, done.

Fixes bitrot in junklog.js.