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

custom-2020
Matt A. Tobin 4 years ago committed by Roy Tam
parent 41e82f421b
commit ee4f00fbb3
  1. 2
      mail/app/profile/all-thunderbird.js
  2. 5
      mail/base/content/mailWindowOverlay.js
  3. 22
      mail/base/content/mailWindowOverlay.xul
  4. 43
      mail/base/content/msgMail3PaneWindow.js
  5. 6
      mail/locales/en-US/chrome/messenger/messenger.dtd

@ -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", true);
pref("mail.provider.enabled", false);
// Pointer to the default engine name.
pref("browser.search.defaultenginename", "chrome://messenger-region/locale/region.properties");

@ -59,11 +59,6 @@ var gDisallow_classes_no_html = 1;
// dialog, and the account provisioner window.
function menu_new_init()
{
// If the account provisioner is pref'd off, we shouldn't display the menu
// item.
ShowMenuItem("newCreateEmailAccountMenuItem",
Services.prefs.getBoolPref("mail.provider.enabled"));
// If we don't have a gFolderDisplay, just get out of here and leave the menu
// as it is.
if (!gFolderDisplay)

@ -1077,16 +1077,6 @@
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);"/>
<menuitem id="appmenu_newFeedAccountMenuItem"
label="&newFeedAccountCmd.label;"
accesskey="&newFeedAccountCmd.accesskey;"
oncommand="AddFeedAccount();"/>
<menuitem id="appmenu_newAccountMenuItem"
label="&newOtherAccountsCmd.label;"
oncommand="MsgAccountWizard();"/>
@ -2246,18 +2236,6 @@
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;"
oncommand="NewMailAccount(msgWindow);"/>
<menuitem id="newFeedAccountMenuItem"
label="&newFeedAccountCmd.label;"
accesskey="&newFeedAccountCmd.accesskey;"
oncommand="AddFeedAccount();"/>
<menuitem id="newAccountMenuItem"
label="&newOtherAccountsCmd.label;"
accesskey="&newOtherAccountsCmd.accesskey;"

@ -372,36 +372,23 @@ var MailPrefObserver = {
*/
function AutoConfigWizard(okCallback)
{
let suppressDialogs = false;
let suppressDialogs = false;
// Try to get the suppression pref that we stashed away in accountProvisionerTab.js.
// If it doesn't exist, nsIPrefBranch throws, so we eat it silently and move along.
try {
suppressDialogs = Services.prefs.getBoolPref("mail.provider.suppress_dialog_on_startup");
} catch(e) {};
if (suppressDialogs) {
// Looks like we were in the middle of filling out an account form. We
// won't display the dialogs in that case.
Services.prefs.clearUserPref("mail.provider.suppress_dialog_on_startup");
okCallback();
return;
}
// Try to get the suppression pref that we stashed away in accountProvisionerTab.js.
// If it doesn't exist, nsIPrefBranch throws, so we eat it silently and move along.
try {
suppressDialogs = Services.prefs.getBoolPref("mail.provider.suppress_dialog_on_startup");
} catch(e) {};
if (suppressDialogs) {
// Looks like we were in the middle of filling out an account form. We
// won't display the dialogs in that case.
Services.prefs.clearUserPref("mail.provider.suppress_dialog_on_startup");
okCallback();
return;
}
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);
msgOpenAccountWizard(okCallback, null);
}
/**

@ -24,12 +24,8 @@
<!ENTITY moveToNewWindow.accesskey "W">
<!ENTITY newVirtualFolderCmd.label "Saved Search…">
<!ENTITY newVirtualFolderCmd.accesskey "S">
<!ENTITY newOtherAccountsCmd.label "Other Accounts…">
<!ENTITY newOtherAccountsCmd.label "Create a New Account…">
<!ENTITY newOtherAccountsCmd.accesskey "O">
<!ENTITY newCreateEmailAccountCmd.label "Get a New Mail Account…">
<!ENTITY newCreateEmailAccountCmd.accesskey "G">
<!ENTITY newExistingEmailAccountCmd.label "Existing Mail Account…">
<!ENTITY newExistingEmailAccountCmd.accesskey "E">
<!ENTITY newIMAccountCmd.label "Chat Account…">
<!ENTITY newIMAccountCmd.accesskey "C">
<!ENTITY newFeedAccountCmd.label "Feed Account…">

Loading…
Cancel
Save