commit 188fbd679a85dc8909bf0eff46b840112a2bd54b Merge: 89bf536 caaf2b5 Author: Ulrike Uhlig u@451f.org Date: Wed May 4 13:00:23 2016 +0200

Merge branch 'master' into post-secure-autoconfig

Makefile | 6 ++++++ chrome/content/emailwizard.js | 4 ++++ components/torbirdy.js | 22 +++++++++++++++++++++- defaults/preferences/prefs.js | 1 + 4 files changed, 32 insertions(+), 1 deletion(-)

diff --cc chrome/content/emailwizard.js index 30024ac,123753b..8218c1b --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@@ -133,11 -136,17 +133,15 @@@ if(!org.torbirdy.emailwizard) org.torbi };

pub.onLoad = function() { - if (disableWizard) { + if (disableAutoConfiguration) { document.getElementById("torbirdy-protocol-box").collapsed = true; - document.getElementById("provisioner_button").disabled = false; - document.getElementById("provisioner_button").hidden = false; - } else { - document.getElementById("provisioner_button").disabled = true; - document.getElementById("provisioner_button").hidden = true; } + document.getElementById("provisioner_button").disabled = true; + document.getElementById("provisioner_button").hidden = true; ++ + // 0 is for POP3 (default), 1 is for IMAP. See emailwizard.xul and prefs.js. + var selectProtocol = prefs.getIntPref("extensions.torbirdy.defaultprotocol") + document.getElementById("torbirdy-protocol").selectedIndex = selectProtocol; };

return pub;