commit 80e6096833b99eee046704b5245db52b25b14ed9 Author: Sukhbir Singh sukhbir@torproject.org Date: Tue Mar 4 12:20:45 2014 -0500

Update emailwizard.js and components/torbirdy.js

- Ensure for new accounts that login_at_startup and download_on_biff are set to false.

- Clear the network.proxy.no_proxies_on preference. --- chrome/content/emailwizard.js | 12 ++++++++++++ components/torbirdy.js | 1 - 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 2cab873..2f2a6a7 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -89,6 +89,18 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts"; }

+ // Do not check for new messages at startup. + var loginAtStartup = 'mail.server.%serverkey%.login_at_startup'; + var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey); + prefs.setBoolPref(loginAtStartupPref, false); + + // Do not automatically download new messages. + if (protocol === "pop3") { + var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff'; + var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey); + prefs.setBoolPref(downloadOnBiffPref, false); + } + // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : onAdvancedSetup(). var windowManager = Cc["@mozilla.org/appshell/window-mediator;1"] .getService(Ci.nsIWindowMediator); diff --git a/components/torbirdy.js b/components/torbirdy.js index 475dcde..b693bef 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -45,7 +45,6 @@ const TorBirdyPrefs = { "network.proxy.socks": "127.0.0.1", "network.proxy.socks_port": 9150, "network.proxy.socks_version": 5, - "network.proxy.no_proxies_on": "localhost, 127.0.0.1",

// Set DNS proxying through SOCKS5. "network.proxy.socks_remote_dns": true,