commit 31de9e4937791467752bc071104e9363a41735c2 Author: Sukhbir Singh sukhbir@torproject.org Date: Mon May 16 14:57:29 2016 -0400

Global let/const are no longer properties (bugzilla #1209777) --- chrome/content/composeoverlay.js | 4 ++-- components/torbirdy.js | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/chrome/content/composeoverlay.js b/chrome/content/composeoverlay.js index 25402b3..843cfbc 100644 --- a/chrome/content/composeoverlay.js +++ b/chrome/content/composeoverlay.js @@ -1,5 +1,5 @@ -const Ci = Components.interfaces; -const Cc = Components.classes; +var Ci = Components.interfaces; +var Cc = Components.classes;

function torbirdyTextRandom() { // Generate alphanumeric random numbers. diff --git a/components/torbirdy.js b/components/torbirdy.js index 5e8e9ca..ead2508 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -1,18 +1,18 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/AddonManager.jsm");

-const Ci = Components.interfaces; -const Cc = Components.classes; -const Cr = Components.results; +var Ci = Components.interfaces; +var Cc = Components.classes; +var Cr = Components.results;

-const SERVICE_CTRID = "@torproject.org/torbirdy;1"; -const SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); -const SERVICE_NAME = "Main TorBirdy Component"; -const TB_ID = "castironthunderbirdclub@torproject.org"; +var SERVICE_CTRID = "@torproject.org/torbirdy;1"; +var SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); +var SERVICE_NAME = "Main TorBirdy Component"; +var TB_ID = "castironthunderbirdclub@torproject.org";

-const kPrefBranch = "extensions.torbirdy.custom."; -const kRestoreBranch = "extensions.torbirdy.restore."; -const kTorBirdyBranch = "extensions.torbirdy."; +var kPrefBranch = "extensions.torbirdy.custom."; +var kRestoreBranch = "extensions.torbirdy.restore."; +var kTorBirdyBranch = "extensions.torbirdy.";

// Default preference values for TorBirdy. // These preferences values will be "enforced": even if the user decides to @@ -23,7 +23,7 @@ const kTorBirdyBranch = "extensions.torbirdy."; // the secure default when Thunderbird starts. // There are some preferences that can be overwritten using TorBirdy's // preferences dialog. See `preferences.js'. -const TorBirdyPrefs = { +var TorBirdyPrefs = { "extensions.torbirdy.protected": false, // When the preferences below have been set, enable TorBirdy.

@@ -211,7 +211,6 @@ const TorBirdyPrefs = { "browser.cache.memory.enable": false, "browser.cache.offline.enable": false, "browser.formfill.enable": false, - "signon.rememberSignons": false, "signon.autofillForms": false,

// https://bugs.torproject.org/10367 @@ -675,4 +674,4 @@ TorBirdy.prototype = {

}

-const NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]); +var NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]);