Browse Source

Revert "Get rid of the entry points for the new mail account provider"

This reverts commit 01db956e33c4f7e2771b967ee0d8edf0a07bb058.
custom-2020
Matt A. Tobin 4 years ago committed by Roy Tam
parent
commit
41e82f421b
  1. 2
      mail/app/profile/all-thunderbird.js
  2. 7
      mail/base/content/mailWindowOverlay.xul
  3. 15
      mail/base/content/msgMail3PaneWindow.js

2
mail/app/profile/all-thunderbird.js

@ -780,7 +780,7 @@ pref("gfx.direct2d.disabled", true);
// Account provisioner.
pref("mail.provider.providerList", "https://broker-live.mozillamessaging.com/provider/list");
pref("mail.provider.suggestFromName", "https://broker-live.mozillamessaging.com/provider/suggest");
pref("mail.provider.enabled", false);
pref("mail.provider.enabled", true);
// Pointer to the default engine name.
pref("browser.search.defaultenginename", "chrome://messenger-region/locale/region.properties");

7
mail/base/content/mailWindowOverlay.xul

@ -1077,6 +1077,9 @@
label="&newVirtualFolderCmd.label;"
command="cmd_newVirtualFolder"/>
<menuseparator id="appmenu_newAccountPopupMenuSeparator"/>
<menuitem id="appmenu_newCreateEmailAccountMenuItem"
label="&newCreateEmailAccountCmd.label;"
oncommand="NewMailAccountProvisioner(msgWindow);"/>
<menuitem id="appmenu_newMailAccountMenuItem"
label="&newExistingEmailAccountCmd.label;"
oncommand="NewMailAccount(msgWindow);"/>
@ -2243,6 +2246,10 @@
command="cmd_newVirtualFolder"
accesskey="&newVirtualFolderCmd.accesskey;"/>
<menuseparator id="newAccountPopupMenuSeparator"/>
<menuitem id="newCreateEmailAccountMenuItem"
label="&newCreateEmailAccountCmd.label;"
accesskey="&newCreateEmailAccountCmd.accesskey;"
oncommand="NewMailAccountProvisioner(msgWindow);"/>
<menuitem id="newMailAccountMenuItem"
label="&newExistingEmailAccountCmd.label;"
accesskey="&newExistingEmailAccountCmd.accesskey;"

15
mail/base/content/msgMail3PaneWindow.js

@ -388,7 +388,20 @@ function AutoConfigWizard(okCallback)
return;
}
NewMailAccount(msgWindow, okCallback);
if (Services.prefs.getBoolPref("mail.provider.enabled")) {
Services.obs.addObserver({
observe: function(aSubject, aTopic, aData) {
if (aTopic == "mail-tabs-session-restored" && aSubject === window) {
// We're done here, unregister this observer.
Services.obs.removeObserver(this, "mail-tabs-session-restored");
NewMailAccountProvisioner(msgWindow, { okCallback: null });
}
}
}, "mail-tabs-session-restored", false);
okCallback();
}
else
NewMailAccount(msgWindow, okCallback);
}
/**

Loading…
Cancel
Save