Bug #368303 --> Thunderbird 2 forgets junk mail settings in the account manager. sr=neil

mailnews/base/prefs/resources/content/AccountManager.js

@@ -965,7 +965,7 @@ function restorePage(pageId, serverId)
 
   // tell the page that new values have been loaded
   if ("onInit" in top.frames["contentFrame"])
-    top.frames["contentFrame"].onInit();
+    top.frames["contentFrame"].onInit(pageId, serverId);
 
   // everything has succeeded, vervied by setting currentPageId
   currentPageId = pageId;

mailnews/base/prefs/resources/content/am-addressing.js

@@ -7,7 +7,7 @@ function onLoad()
   parent.onPanelLoaded('am-addressing.xul');
 }
 
-function onInit() 
+function onInit(aPageId, aServerId) 
 {
   onInitCompositionAndAddressing();
 }

mailnews/base/prefs/resources/content/am-copies.js

@@ -42,7 +42,7 @@ var gFccRadioElemChoiceLocked, gDraftsRadioElemChoiceLocked, gTmplRadioElemChoic
 var gDefaultPickerMode = "1";
 
 var gFccFolderWithDelim, gDraftsFolderWithDelim, gTemplatesFolderWithDelim;
-
+var gCurrentServerId;
 var gPrefBranch = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
 
 // Picker IDs
@@ -63,8 +63,9 @@ function onPreInit(account, accountValues)
  * Set the global radio element choices and initialize folder/account pickers. 
  * Also, initialize other UI elements (bcc self, fcc picker controller checkboxes). 
  */
-function onInit() 
+function onInit(aPageId, aServerId) 
 {
+  gCurrentServerId = aServerId;
     onInitCopiesAndFolders();
 }
 
@@ -115,14 +116,6 @@ function SetGlobalRadioElemChoices()
     if (!gTmplRadioElemChoice) gTmplRadioElemChoice = gDefaultPickerMode;
 }
 
-// Get Current Server ID selected in the account tree
-function GetCurrentServerId()
-{
-    var tree = window.parent.accounttree;
-    var result = getServerIdAndPageIdFromTree(tree);
-    return result.serverId;
-}
-
 /* 
  * Set Account and Folder elements based on the values read from 
  * preferences file. Default picker mode, if none specified at this stage, is

mailnews/base/prefs/resources/content/am-copies.xul

@@ -12,8 +12,7 @@
     <![CDATA[
       function getAccountForFolderPickerState()
       { 
-        var serverId = GetCurrentServerId();
-        return parent.getAccountFromServerId(serverId);
+        return parent.getAccountFromServerId(gCurrentServerId);
       }
     ]]>
   </script>

mailnews/base/prefs/resources/content/am-junk.js

@@ -39,7 +39,7 @@
 const KEY_APPDIR = "XCurProcD";
 const KEY_PROFILEDIR = "PrefD";
 
-function onInit()
+function onInit(aPageId, aServerId)
 {
   // manually adjust several pref UI elements
   document.getElementById('spamLevel').checked =
@@ -48,7 +48,7 @@ function onInit()
   var spamActionTargetAccount = document.getElementById('server.spamActionTargetAccount').value;
   if (!spamActionTargetAccount)
   {
-    var server = GetMsgFolderFromUri(parent.pendingServerId, false).server;
+    var server = GetMsgFolderFromUri(aServerId, false).server;
     if (server.canCreateFoldersOnServer && server.canSearchMessages)
       spamActionTargetAccount = parent.pendingServerId;
     else

mailnews/base/prefs/resources/content/am-main.js

@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-function onInit() 
+function onInit(aPageId, aServerId)
 {
   var accountName = document.getElementById("server.prettyName");
   var title = document.getElementById("am-main-title");

mailnews/base/prefs/resources/content/am-offline.js

@@ -42,7 +42,7 @@ var gImapIncomingServer;
 var gPref = null;
 var gLockedPref = null;
 
-function onInit() 
+function onInit(aPageId, aServerId) 
 {
     onLockPreference();	
 

mailnews/base/prefs/resources/content/am-server.js

@@ -46,7 +46,7 @@ var gRedirectorType = "";
 var gServer;
 var gObserver;
 
-function onInit() 
+function onInit(aPageId, aServerId) 
 {
     initServerType();
 
@@ -54,7 +54,7 @@ function onInit()
     setupMailOnServerUI();
     setupFixedUI();
     setupNotifyUI();
-    setupImapDeleteUI();
+    setupImapDeleteUI(aServerId);
 }
 
 function onPreInit(account, accountValues)
@@ -315,7 +315,7 @@ function BrowseForNewsrc()
     newsrcTextBox.value = fp.file.path;
 }
 
-function setupImapDeleteUI()
+function setupImapDeleteUI(aServerId)
 {
   // read delete_model preference
   var deleteModel = document.getElementById("imap.deleteModel").getAttribute("value");
@@ -323,11 +323,10 @@ function setupImapDeleteUI()
 
   // read trash_folder_name preference
   var trashFolderName = getTrashFolderName();
-  var serverId = GetCurrentServerId();
 
   // set folderPicker menulist
-  document.getElementById("msgTrashFolderPicker").setAttribute("ref", serverId);
-  var trashFolderUri = serverId+"/"+trashFolderName;
+  document.getElementById("msgTrashFolderPicker").setAttribute("ref", aServerId);
+  var trashFolderUri = aServerId+"/"+trashFolderName;
   SetFolderPicker(trashFolderUri,"msgTrashFolderPicker");
 }
 
@@ -375,11 +374,3 @@ function getTrashFolderName()
   }
   return trashFolderName;
 }
-
-// Get Current Server ID selected in the account tree
-function GetCurrentServerId()
-{
-  var tree = window.parent.accounttree;
-  var result = getServerIdAndPageIdFromTree(tree);
-  return result.serverId;
-}

mailnews/base/prefs/resources/content/am-serverwithnoidentities.js

@@ -38,7 +38,7 @@
 
 var gServer;
 
-function onInit() {
+function onInit(aPageId, aServerId) {
 }
 
 function onPreInit(account, accountValues)