From e2e50d065f19b8d0ceb52214a54da7206c033c66 Mon Sep 17 00:00:00 2001
From: FranklinDM <mrmineshafter17@gmail.com>
Date: Mon, 15 Jan 2024 02:23:38 +0800
Subject: [PATCH] Issue #2454 - Guard the classic email account wizard with its
 own configure option

---
 build/moz.configure/old.configure             |  1 +
 mailnews/base/content/msgAccountCentral.xul   | 14 ++++++------
 .../base/prefs/content/AccountManager.xul     | 22 +++++++++----------
 mailnews/base/prefs/content/AccountWizard.xul |  8 +++----
 mailnews/base/prefs/content/accountUtils.js   |  2 ++
 mailnews/jar.mn                               |  4 ++--
 old-configure.in                              | 15 +++++++++++++
 7 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 6c826269dd..6dcc86546e 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -312,6 +312,7 @@ def old_configure_options(*options):
     '--enable-incomplete-external-linkage',
     '--enable-mailnews',
     '--enable-mailnews-oauth2',
+    '--enable-classic-account-wizard',
     
     # Below are configure flags used by Pale Moon
     '--disable-browser-statusbar',
diff --git a/mailnews/base/content/msgAccountCentral.xul b/mailnews/base/content/msgAccountCentral.xul
index c1a43b0358..f6eef90a35 100644
--- a/mailnews/base/content/msgAccountCentral.xul
+++ b/mailnews/base/content/msgAccountCentral.xul
@@ -153,19 +153,19 @@
       <spacer id="CreateAccount.spacer" flex="1" collapsed="true"/>
       <row id="CreateAccount" class="acctCentralRow" collapsed="true">
         <hbox>
-#if defined(MOZ_THUNDERBIRD) && defined(HYPE_ICEDOVE)
-          <label class="acctCentralText"
-                 value="&newAcct.label;"
-                 chromedir="&locale.dir;"/>
-#else
+#ifdef MOZ_CLASSIC_ACCOUNT_WIZARD
           <label class="acctCentralText acctCentralLinkText"
                  value="&newAcctLink.label;"
                  chromedir="&locale.dir;"
                  onclick="CreateNewAccount();"/>
-#endif
         </hbox>
       </row>
-#if defined(MOZ_THUNDERBIRD) && defined(HYPE_ICEDOVE)
+#else
+          <label class="acctCentralText"
+                 value="&newAcct.label;"
+                 chromedir="&locale.dir;"/>
+        </hbox>
+      </row>
       <row id="CreateAccounts" class="acctCentralRow" collapsed="true">
         <vbox id="CreateAccountsList">
           <label id="CreateAccountMail"
diff --git a/mailnews/base/prefs/content/AccountManager.xul b/mailnews/base/prefs/content/AccountManager.xul
index a14156b328..9d31dd1d25 100644
--- a/mailnews/base/prefs/content/AccountManager.xul
+++ b/mailnews/base/prefs/content/AccountManager.xul
@@ -35,7 +35,17 @@
         <treechildren id="account-tree-children"/>
       </tree>
 
-#if defined(MOZ_THUNDERBIRD) && defined(HYPE_ICEDOVE)
+#ifdef MOZ_CLASSIC_ACCOUNT_WIZARD
+      <button label="&addAccountButton.label;" oncommand="onAddAccount(event);" id="addAccountButton"
+              prefstring="mail.disable_new_account_addition"
+              accesskey="&addAccountButton.accesskey;"/>
+      <button label="&setDefaultButton.label;" oncommand="onSetDefault(event);" disabled="true" id="setDefaultButton"
+              prefstring="mail.disable_button.set_default_account"
+              accesskey="&setDefaultButton.accesskey;"/>
+      <button disabled="true" label="&removeButton.label;" oncommand="onRemoveAccount(event);" id="removeButton"
+              prefstring="mail.disable_button.delete_account"
+              accesskey="&removeButton.accesskey;"/>
+#else
       <button id="accountActionsButton" type="menu"
               label="&accountActionsButton.label;"
               accesskey="&accountActionsButton.accesskey;">
@@ -69,16 +79,6 @@
                     oncommand="onRemoveAccount(event); event.stopPropagation();"/>
         </menupopup>
       </button>
-#else
-      <button label="&addAccountButton.label;" oncommand="onAddAccount(event);" id="addAccountButton"
-              prefstring="mail.disable_new_account_addition"
-              accesskey="&addAccountButton.accesskey;"/>
-      <button label="&setDefaultButton.label;" oncommand="onSetDefault(event);" disabled="true" id="setDefaultButton"
-              prefstring="mail.disable_button.set_default_account"
-              accesskey="&setDefaultButton.accesskey;"/>
-      <button disabled="true" label="&removeButton.label;" oncommand="onRemoveAccount(event);" id="removeButton"
-              prefstring="mail.disable_button.delete_account"
-              accesskey="&removeButton.accesskey;"/>
 #endif
     </vbox>
 
diff --git a/mailnews/base/prefs/content/AccountWizard.xul b/mailnews/base/prefs/content/AccountWizard.xul
index 2aee2e3a5d..a2cf9a5ba9 100644
--- a/mailnews/base/prefs/content/AccountWizard.xul
+++ b/mailnews/base/prefs/content/AccountWizard.xul
@@ -10,10 +10,10 @@
 <wizard id="AccountWizard" title="&windowTitle.label;"
         onwizardcancel="return onCancel();"
         onwizardfinish="return FinishAccount();"
-#if defined(MOZ_THUNDERBIRD) && defined(HYPE_ICEDOVE)
-        onload="onAccountWizardLoad(); initAccountWizardTB(window.arguments);"
-#else
+#ifdef MOZ_CLASSIC_ACCOUNT_WIZARD
         onload="onAccountWizardLoad();"
+#else
+        onload="onAccountWizardLoad(); initAccountWizardTB(window.arguments);"
 #endif
         style="&accountWizard.size;"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
@@ -43,7 +43,7 @@
       <label control="acctyperadio">&accountTypeDirections.label;</label>
       <separator/>
       <radiogroup id="acctyperadio" >
-#if !defined(MOZ_THUNDERBIRD) || !defined(HYPE_ICEDOVE)
+#ifdef MOZ_CLASSIC_ACCOUNT_WIZARD
         <radio id="mailaccount" value="mailaccount"
                label="&accountTypeMail.label;" accesskey="&accountTypeMail.accesskey;"
                selected="true"/>
diff --git a/mailnews/base/prefs/content/accountUtils.js b/mailnews/base/prefs/content/accountUtils.js
index 8b5020915e..86bd90d641 100644
--- a/mailnews/base/prefs/content/accountUtils.js
+++ b/mailnews/base/prefs/content/accountUtils.js
@@ -200,6 +200,7 @@ function msgOpenAccountWizard(wizardCallback, type)
     selectServer(null, null);
 }
 
+#ifndef MOZ_CLASSIC_ACCOUNT_WIZARD
 function initAccountWizardTB(args) {
   let type = args[0] && args[0].acctType;
   let selType = type == "newsgroups" ? "newsaccount" :
@@ -216,6 +217,7 @@ function initAccountWizardTB(args) {
   else
     acctyperadio.selectedItem = acctyperadio.getItemAtIndex(0);
 }
+#endif
 
 function AddFeedAccount() {
   window.openDialog("chrome://messenger-newsblog/content/feedAccountWizard.xul",
diff --git a/mailnews/jar.mn b/mailnews/jar.mn
index 3f0038aff2..e43f6a5003 100644
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -56,7 +56,7 @@ messenger.jar:
     content/messenger/aw-outgoing.js                                           (base/prefs/content/aw-outgoing.js)
     content/messenger/aw-accname.js                                            (base/prefs/content/aw-accname.js)
     content/messenger/aw-done.js                                               (base/prefs/content/aw-done.js)
-    content/messenger/accountUtils.js                                          (base/prefs/content/accountUtils.js)
+*   content/messenger/accountUtils.js                                          (base/prefs/content/accountUtils.js)
     content/messenger/amUtils.js                                               (base/prefs/content/amUtils.js)
     content/messenger/ispUtils.js                                              (base/prefs/content/ispUtils.js)
     content/messenger/SmtpServerEdit.xul                                       (base/prefs/content/SmtpServerEdit.xul)
@@ -65,7 +65,7 @@ messenger.jar:
 *   content/messenger/smtpEditOverlay.js                                       (base/prefs/content/smtpEditOverlay.js)
     content/messenger/removeAccount.xul                                        (base/prefs/content/removeAccount.xul)
     content/messenger/removeAccount.js                                         (base/prefs/content/removeAccount.js)
-#if defined(MOZ_THUNDERBIRD) && defined(HYPE_ICEDOVE)
+#ifndef MOZ_CLASSIC_ACCOUNT_WIZARD
 *   content/messenger/accountcreation/accountConfig.js                         (base/prefs/content/accountcreation/accountConfig.js)
 *   content/messenger/accountcreation/createInBackend.js                       (base/prefs/content/accountcreation/createInBackend.js)
 *   content/messenger/accountcreation/emailWizard.js                           (base/prefs/content/accountcreation/emailWizard.js)
diff --git a/old-configure.in b/old-configure.in
index ed20484a2c..034d0f4630 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2050,6 +2050,7 @@ MOZ_USERINFO=1
 NSS_DISABLE_DBM=
 MOZ_MAILNEWS=
 MOZ_MAILNEWS_OAUTH2=
+MOZ_CLASSIC_ACCOUNT_WIZARD=
 MOZ_LDAP_XPCOM=
 MOZ_MORK=
 MOZ_MAPI_SUPPORT=
@@ -2673,6 +2674,20 @@ fi
 
 AC_SUBST(MOZ_MAILNEWS_OAUTH2)
 
+dnl =========================================================
+dnl = Mailnews Classic Account Wizard
+dnl =========================================================
+MOZ_ARG_ENABLE_BOOL(classic-account-wizard,
+[  --enable-classic-account-wizard   Enable the classic account wizard in mailnews],
+    MOZ_CLASSIC_ACCOUNT_WIZARD=1,
+    MOZ_CLASSIC_ACCOUNT_WIZARD= )
+
+if test -n "$MOZ_CLASSIC_ACCOUNT_WIZARD"; then
+   AC_DEFINE(MOZ_CLASSIC_ACCOUNT_WIZARD)
+fi
+
+AC_SUBST(MOZ_CLASSIC_ACCOUNT_WIZARD)
+
 dnl =========================================================
 dnl = LDAP
 dnl =========================================================