commit 847fe49fe69f894a3c3f56c0882f0f3205404014 Author: Sukhbir Singh sukhbir@torproject.org Date: Mon Sep 9 00:17:32 2013 -0400

Some more code fixes --- chrome/content/emailwizard.js | 4 ++-- chrome/content/preferences.js | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 9142ac4..8126f23 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -63,8 +63,8 @@ if (!org.torbirdy.emailwizard) org.torbirdy.emailwizard = { var newAccount = createAccountInBackend(config);

// Set check_new_mail to false. We can't do this through the account setup, so let's do it here. - const checkNewMail = 'mail.server.%serverkey%.check_new_mail'; - const serverkey = newAccount.incomingServer.key; + var checkNewMail = 'mail.server.%serverkey%.check_new_mail'; + var serverkey = newAccount.incomingServer.key; var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey); this.prefs.setBoolPref(checkNewMailPref, false);

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index c61259f..3578f0d 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -74,7 +74,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = { if (typeof keyserver === "undefined") { var keyserverValue = (anonService === "tor") ? this.torKeyserver : this.jondoKeyserver; } else { - var keyserverValue = this.enigmailKeyserver.value; + var keyserverValue = keyserver.value; } if (anonService === "tor") { this.setPreferences(extension, keyserverValue); @@ -253,12 +253,12 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = { setProxyCustom: function() { this.resetAll();

- var socks_host = this.socksHost.value; - var socks_port = this.socksPort.value; + var socksHost = this.socksHost.value; + var socksPort = this.socksPort.value;

// Set them now. - this.setPreferences("network.proxy.socks", socks_host); - this.setPreferences("network.proxy.socks_port", parseInt(socks_port, 10)); + this.setPreferences("network.proxy.socks", socksHost); + this.setPreferences("network.proxy.socks_port", parseInt(socksPort, 10));

this.setPanelSettings(this.strBundle.GetStringFromName("torbirdy.enabled.custom"), "green"); this.prefs.setIntPref(this.prefBranch + 'proxy', 2); @@ -433,7 +433,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = { // Proxy. this.anonCustomService = document.getElementById('torbirdy-anonservice'); this.anonService = document.getElementById('torbirdy-proxy-settings'); - this.anonCustomService = document.getElementById('torbirdy-anonservice'); this.anonType = document.getElementById('torbirdy-anon-settings'); this.socksHost = document.getElementById('torbirdy-socks-host'); this.socksPort = document.getElementById('torbirdy-socks-port'); @@ -498,11 +497,11 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = {

// Custom. if (anonService === 2) { - var socks_host = this.prefs.getCharPref(this.customBranch + 'network.proxy.socks'); - var socks_port = this.prefs.getIntPref(this.customBranch + 'network.proxy.socks_port'); + var socksHost = this.prefs.getCharPref(this.customBranch + 'network.proxy.socks'); + var socksPort = this.prefs.getIntPref(this.customBranch + 'network.proxy.socks_port');

- this.socksHost.value = socks_host; - this.socksPort.value = socks_port; + this.socksHost.value = socksHost; + this.socksPort.value = socksPort; // Enable the settings. this.socksHost.disabled = false; this.socksPort.disabled = false;