Back out non-string parts of Bug 678255 (Advanced dialog for POP3 account showing the IMAP dialog) due to breaking the Thunderbird advanced server settings dialog. rs=bwinton. a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 18 Oct 2011 21:35:31 +0100
changeset 9297 84b6bba97413e846c62127c6f9da9f7c23ac897c
parent 9296 88d3ceed5fd2acac6dffc4f7dc98f7e5f461eaed
child 9298 345b79cbefce09ac2718f1faab129e8cadfeb6cd
push id230
push userbugzilla@standard8.plus.com
push dateTue, 08 Nov 2011 22:55:24 +0000
treeherdercomm-beta@63dad5648415 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwinton, Standard8
bugs678255
Back out non-string parts of Bug 678255 (Advanced dialog for POP3 account showing the IMAP dialog) due to breaking the Thunderbird advanced server settings dialog. rs=bwinton. a=Standard8
mailnews/base/prefs/content/am-server-advanced.js
mailnews/base/prefs/content/am-server-advanced.xul
mailnews/base/prefs/content/am-server.js
--- a/mailnews/base/prefs/content/am-server-advanced.js
+++ b/mailnews/base/prefs/content/am-server-advanced.js
@@ -57,23 +57,16 @@ function getControls()
 function getLocalFoldersAccount()
 {
   var localFoldersServer = gAccountManager.localFoldersServer;
   return gAccountManager.FindAccountForServer(localFoldersServer);
 }
 
 function onLoad()
 {
-  var prettyName = gServerSettings.serverPrettyName;
-
-  if (prettyName)
-    document.getElementById("serverPrettyName").value = 
-      document.getElementById("bundle_prefs")
-              .getFormattedString("forAccount", [prettyName]);
-
   if (gServerSettings.serverType == "imap")
   {
     document.getElementById("pop3Panel").hidden = true;
   }
   else if (gServerSettings.serverType == "pop3")
   {
     var radioGroup = document.getElementById("folderStorage");
     document.getElementById("imapPanel").hidden = true;
--- a/mailnews/base/prefs/content/am-server-advanced.xul
+++ b/mailnews/base/prefs/content/am-server-advanced.xul
@@ -48,17 +48,16 @@
         title="&serverAdvanced.label;"
         buttons="accept,cancel"
         onload="onLoad();"
         ondialogaccept="return onOk();">
 
   <script type="application/javascript" src="am-server-advanced.js"/>
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
 
-    <label id="serverPrettyName"/>
     <!-- IMAP Panel -->
     <vbox id="imapPanel">
       <hbox>
         <label value="&serverDirectory.label;"
                accesskey="&serverDirectory.accesskey;"
                control="serverDirectory"/>
         <textbox amsa_persist="true" id="serverDirectory"/>
       </hbox>
--- a/mailnews/base/prefs/content/am-server.js
+++ b/mailnews/base/prefs/content/am-server.js
@@ -133,17 +133,16 @@ function setDivText(divname, value)
 function onAdvanced()
 {
   // Store the server type and, if an IMAP or POP3 server,
   // the settings needed for the IMAP/POP3 tab into the array
   var serverSettings = {};
   var serverType = document.getElementById("server.type").getAttribute("value");
   serverSettings.serverType = serverType;
 
-  serverSettings.serverPrettyName = gServer.prettyName;
 
   if (serverType == "imap")
   {
     serverSettings.dualUseFolders = document.getElementById("imap.dualUseFolders").checked;
     serverSettings.usingSubscription = document.getElementById("imap.usingSubscription").checked;
     serverSettings.useIdle = document.getElementById("imap.useIdle").checked;
     serverSettings.maximumConnectionsNumber = document.getElementById("imap.maximumConnectionsNumber").getAttribute("value");
     // string prefs