diff --git a/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.xul b/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
index ea15fb356e4..c0c9577054f 100644
--- a/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
@@ -39,7 +39,7 @@
>
-
+
diff --git a/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.js b/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.js
index c280d768915..2de7a00be75 100644
--- a/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.js
+++ b/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.js
@@ -125,17 +125,12 @@ function refreshServerList()
for (var i=0; i< selectedItems.length; i++)
oldSelectedIds[i] = selectedItems[0].id;
- // recreate
- // note - I tried creating the node pre-populated,
- // but the tree wouldn't notice the update
- dump("Removing " + serverList.firstChild.localName + "\n");
- if (serverList.firstChild &&
- serverList.firstChild.localName.toLowerCase() == "treechildren")
- serverList.removeChild(serverList.firstChild);
+ var treeChildren = document.getElementById("smtpTreeChildren");
+
+ // remove all children
+ while (treeChildren.hasChildNodes())
+ treeChildren.removeChild(treeChildren.lastChild);
- var treeChildren = document.createElement("treechildren");
- serverList.appendChild(treeChildren);
-
var defaultServer = smtpService.defaultServer;
fillSmtpServers(treeChildren,smtpService.smtpServers, defaultServer);
diff --git a/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.xul b/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.xul
index 6251b8ee84c..fe06a829376 100644
--- a/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.xul
@@ -41,15 +41,13 @@
-
-
-
+
&smtpListDesc.label;
-
+
@@ -57,13 +55,13 @@
+ oncommand="onAdd(event);" value="&smtpListAdd.label;"/>
+ oncommand="onEdit(event);" value="&smtpListEdit.label;"/>
+ oncommand="onDelete(event);" value="&smtpListDelete.label;"/>
+ oncommand="onSetDefault(event);" value="&smtpListSetDefault.label;"/>
diff --git a/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.js b/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.js
index 97f0ed94a2c..4aba461cf06 100644
--- a/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.js
+++ b/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.js
@@ -37,12 +37,10 @@ function initSmtpSettings(server) {
gSmtpHostname = document.getElementById("smtp.hostname");
gSmtpUseUsername = document.getElementById("smtp.useUsername");
gSmtpAuthMethod = document.getElementById("smtp.authMethod");
- gSmtpSavePassword = document.getElementById("smtp.savePassword")
if (server) {
gSmtpHostname.value = server.hostname;
gSmtpUsername.value = server.username;
- gSmtpSavePassword.checked = server.savePassword;
gSmtpAuthMethod.setAttribute("value", server.authMethod);
// radio groups not implemented
//document.getElementById("smtp.trySSL").value = server.trySSL;
@@ -74,7 +72,6 @@ function saveSmtpSettings(server)
dump("Saved authmethod = " + server.authMethod +
" but checked = " + gSmtpUseUsername.checked + "\n");
server.username = gSmtpUsername.value;
- //server.savePassword = gSmtpSavePassword.checked;
}
}
@@ -82,7 +79,6 @@ function onUseUsername(checkbox, dofocus)
{
if (checkbox.checked) {
gSmtpUsername.removeAttribute("disabled");
- gSmtpSavePassword.removeAttribute("disabled");
if (dofocus)
gSmtpUsername.focus();
if (gSavedUsername && gSavedUsername != "")
@@ -91,7 +87,6 @@ function onUseUsername(checkbox, dofocus)
gSavedUsername = gSmtpUsername.value;
gSmtpUsername.value = "";
gSmtpUsername.setAttribute("disabled", "true");
- gSmtpSavePassword.setAttribute("disabled", "true");
}
}
diff --git a/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.xul b/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
index dafd93b07e8..3563c570d82 100644
--- a/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
@@ -48,7 +48,6 @@
-