summaryrefslogtreecommitdiffstats
path: root/mailnews/base/prefs
diff options
context:
space:
mode:
Diffstat (limited to 'mailnews/base/prefs')
-rw-r--r--mailnews/base/prefs/content/AccountManager.js6
-rw-r--r--mailnews/base/prefs/content/removeAccount.js8
-rw-r--r--mailnews/base/prefs/content/removeAccount.xul5
3 files changed, 0 insertions, 19 deletions
diff --git a/mailnews/base/prefs/content/AccountManager.js b/mailnews/base/prefs/content/AccountManager.js
index 81fb115de..5de98ecd0 100644
--- a/mailnews/base/prefs/content/AccountManager.js
+++ b/mailnews/base/prefs/content/AccountManager.js
@@ -899,9 +899,6 @@ function updateButtons(tree, account) {
* Called only by Thunderbird.
*/
function initAccountActionsButtons(menupopup) {
- if (!Services.prefs.getBoolPref("mail.chat.enabled"))
- document.getElementById("accountActionsAddIMAccount").hidden = true;
-
updateItems(
document.getElementById("accounttree"),
getCurrentAccount(),
@@ -1486,9 +1483,6 @@ var gAccountTree = {
try {
server = account.incomingServer;
- if (server.type == "im" && !Services.prefs.getBoolPref("mail.chat.enabled"))
- continue;
-
accountName = server.prettyName;
// Now add our panels.
diff --git a/mailnews/base/prefs/content/removeAccount.js b/mailnews/base/prefs/content/removeAccount.js
index 350a0a065..77bbe58d5 100644
--- a/mailnews/base/prefs/content/removeAccount.js
+++ b/mailnews/base/prefs/content/removeAccount.js
@@ -39,12 +39,6 @@ function onLoad(event) {
document.getElementById("removeDataPossibility").collapsed = true;
}
- if (gServer.type == "im") {
- let dataCheckbox = document.getElementById("removeData");
- dataCheckbox.label = dataCheckbox.getAttribute("labelChat");
- dataCheckbox.accessKey = dataCheckbox.getAttribute("accesskeyChat");
- }
-
enableRemove();
window.sizeToContent();
}
@@ -80,8 +74,6 @@ function showInfo() {
// TODO: bug 1238271, this should use showFor attributes if possible.
if (gServer.type == "imap" || gServer.type == "nntp") {
document.getElementById("serverAccount").collapsed = false;
- } else if (gServer.type == "im") {
- document.getElementById("chatAccount").collapsed = false;
} else {
document.getElementById("localAccount").collapsed = false;
}
diff --git a/mailnews/base/prefs/content/removeAccount.xul b/mailnews/base/prefs/content/removeAccount.xul
index 371262a11..c1d565973 100644
--- a/mailnews/base/prefs/content/removeAccount.xul
+++ b/mailnews/base/prefs/content/removeAccount.xul
@@ -46,10 +46,8 @@
<vbox id="removeDataPossibility" collapsed="false">
<checkbox id="removeData"
label="&removeData.label;"
- labelChat="&removeData.label;"
checked="false"
accesskey="&removeData.accesskey;"
- accesskeyChat="&removeData.accesskey;"
oncommand="enableRemove();"/>
<vbox class="indent" collapsed="true">
<description id="localAccount" collapsed="true">
@@ -58,9 +56,6 @@
<description id="serverAccount" collapsed="true">
&removeDataServerAccount.desc;
</description>
- <description id="chatAccount" collapsed="true">
- &removeDataLocalAccount.desc;
- </description>
<hbox align="center">
<button id="showLocalDirectory"
label="&showData.label;"