var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"].getService(Components.interfaces.nsIProperties); gPrefBranch = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService) (This can be removed altogether as it is not used after bug 725488.)

Also fix the header to: /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

Comment on attachment 669256 [details] [diff] [review] patch Review of attachment 669256 [details] [diff] [review]: ----------------------------------------------------------------- Great cleanup, aceman! ::: mailnews/base/prefs/content/am-junk.js @@ +193,5 @@ > function updateJunkTargetsAndRetention() { > onCheckItem("server.moveTargetMode", ["server.moveOnSpam"]); > updateJunkTargets(); > onCheckItem("server.purgeSpam", ["server.moveOnSpam"]); > + document.getElementById("purgeLabel").disabled = Why was this moved? If there wasn't a good reason, put it back please. :) @@ +291,4 @@ > > while (entries.hasMoreElements()) > { > + let entry = entries.nextFile; Nice cleanup in here.

(In reply to Mike Conley (:mconley) from comment #3) > ::: mailnews/base/prefs/content/am-junk.js > @@ +193,5 @@ > > function updateJunkTargetsAndRetention() { > > onCheckItem("server.moveTargetMode", ["server.moveOnSpam"]); > > updateJunkTargets(); > > onCheckItem("server.purgeSpam", ["server.moveOnSpam"]); > > + document.getElementById("purgeLabel").disabled = > > Why was this moved? If there wasn't a good reason, put it back please. :) This is intentional and just fixes a minor problem with patch from bug 725488.