summaryrefslogtreecommitdiffstats
path: root/mailnews
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-03 20:22:14 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-03 20:22:14 -0500
commit5d18a70aa47415091257ee5cda6e0aa0c83d7167 (patch)
tree3854a2264221edaa4ad48f9422e917ddac730d95 /mailnews
parent1f23280e6a96b3c805a60ff6dbe87b226051c585 (diff)
downloadUXP-5d18a70aa47415091257ee5cda6e0aa0c83d7167.tar
UXP-5d18a70aa47415091257ee5cda6e0aa0c83d7167.tar.gz
UXP-5d18a70aa47415091257ee5cda6e0aa0c83d7167.tar.lz
UXP-5d18a70aa47415091257ee5cda6e0aa0c83d7167.tar.xz
UXP-5d18a70aa47415091257ee5cda6e0aa0c83d7167.zip
Issue #1258 - Part 5: Only IceDove cares about Thunderbird's baby mode account creation
Diffstat (limited to 'mailnews')
-rw-r--r--mailnews/base/content/msgAccountCentral.xul4
-rw-r--r--mailnews/base/prefs/content/AccountManager.xul2
-rw-r--r--mailnews/base/prefs/content/AccountWizard.xul4
-rw-r--r--mailnews/jar.mn2
4 files changed, 6 insertions, 6 deletions
diff --git a/mailnews/base/content/msgAccountCentral.xul b/mailnews/base/content/msgAccountCentral.xul
index 7ac6f94cb..70c2209f3 100644
--- a/mailnews/base/content/msgAccountCentral.xul
+++ b/mailnews/base/content/msgAccountCentral.xul
@@ -153,7 +153,7 @@
<spacer id="CreateAccount.spacer" flex="1" collapsed="true"/>
<row id="CreateAccount" class="acctCentralRow" collapsed="true">
<hbox>
-#ifdef MOZ_THUNDERBIRD
+#if defined(MOZ_THUNDERBIRD) && defined(HYPE_ICEDOVE)
<label class="acctCentralText"
value="&newAcct.label;"
chromedir="&locale.dir;"/>
@@ -165,7 +165,7 @@
#endif
</hbox>
</row>
-#ifdef MOZ_THUNDERBIRD
+#if defined(MOZ_THUNDERBIRD) && defined(HYPE_ICEDOVE)
<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 d3bb7608d..a14156b32 100644
--- a/mailnews/base/prefs/content/AccountManager.xul
+++ b/mailnews/base/prefs/content/AccountManager.xul
@@ -35,7 +35,7 @@
<treechildren id="account-tree-children"/>
</tree>
-#ifdef MOZ_THUNDERBIRD
+#if defined(MOZ_THUNDERBIRD) && defined(HYPE_ICEDOVE)
<button id="accountActionsButton" type="menu"
label="&accountActionsButton.label;"
accesskey="&accountActionsButton.accesskey;">
diff --git a/mailnews/base/prefs/content/AccountWizard.xul b/mailnews/base/prefs/content/AccountWizard.xul
index 45da359ab..2aee2e3a5 100644
--- a/mailnews/base/prefs/content/AccountWizard.xul
+++ b/mailnews/base/prefs/content/AccountWizard.xul
@@ -10,7 +10,7 @@
<wizard id="AccountWizard" title="&windowTitle.label;"
onwizardcancel="return onCancel();"
onwizardfinish="return FinishAccount();"
-#ifdef MOZ_THUNDERBIRD
+#if defined(MOZ_THUNDERBIRD) && defined(HYPE_ICEDOVE)
onload="onAccountWizardLoad(); initAccountWizardTB(window.arguments);"
#else
onload="onAccountWizardLoad();"
@@ -43,7 +43,7 @@
<label control="acctyperadio">&accountTypeDirections.label;</label>
<separator/>
<radiogroup id="acctyperadio" >
-#ifndef MOZ_THUNDERBIRD
+#if !defined(MOZ_THUNDERBIRD) || !defined(HYPE_ICEDOVE)
<radio id="mailaccount" value="mailaccount"
label="&accountTypeMail.label;" accesskey="&accountTypeMail.accesskey;"
selected="true"/>
diff --git a/mailnews/jar.mn b/mailnews/jar.mn
index e87badf34..e2b851197 100644
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -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)
-#ifdef MOZ_THUNDERBIRD
+#if defined(MOZ_THUNDERBIRD) && defined(HYPE_ICEDOVE)
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)