Bug 540209 - Kill MsgReload. r+moa=Mnyromyr
authorEdmund Wong <ewong@pw-wspx.org>
Thu, 18 Mar 2010 21:52:29 +0100
changeset 5207 1e618f0d591d27b20f8b0779a22a46c655b5da01
parent 5206 5ad4853677c70f4f8124b3634757b418b2d70713
child 5208 f663c3879c22b764e1f162f645e48dea84991aac
push idunknown
push userunknown
push dateunknown
bugs540209
Bug 540209 - Kill MsgReload. r+moa=Mnyromyr
mailnews/base/content/shareglue.js
suite/mailnews/mail3PaneWindowCommands.js
suite/mailnews/mailWindowOverlay.js
suite/mailnews/messageWindow.js
suite/mailnews/msgHdrViewOverlay.js
--- a/mailnews/base/content/shareglue.js
+++ b/mailnews/base/content/shareglue.js
@@ -45,10 +45,10 @@
 function MessengerSetForcedCharacterSet(aCharset)
 {
   messenger.setDocumentCharset(aCharset);
   msgWindow.mailCharacterSet = aCharset;
   msgWindow.charsetOverride = true;
 
   // DO NOT try to reload the message here. we do this automatically now in
   //  messenger.SetDocumentCharset. You'll just break things and reak havoc
-  // if you call MsgReload() here...
+  // if you call ReloadMessage() here...
 }
--- a/suite/mailnews/mail3PaneWindowCommands.js
+++ b/suite/mailnews/mail3PaneWindowCommands.js
@@ -632,17 +632,17 @@ var DefaultController =
 				return;
 			case "cmd_viewPageSource":
 				MsgViewPageSource();
 				return;
 			case "cmd_setFolderCharset":
 				MsgFolderProperties();
 				return;
 			case "cmd_reload":
-				MsgReload();
+				ReloadMessage();
 				return;
 			case "cmd_find":
 				MsgFind();
 				return;
 			case "cmd_findAgain":
 				MsgFindAgain(false);
 				return;
 			case "cmd_findPrev":
--- a/suite/mailnews/mailWindowOverlay.js
+++ b/suite/mailnews/mailWindowOverlay.js
@@ -1915,60 +1915,60 @@ function MsgApplyFiltersToSelection()
 function ChangeMailLayout(newLayout)
 {
   gPrefBranch.setIntPref("mail.pane_config.dynamic", newLayout);
 }
 
 function MsgViewAllHeaders()
 {
     gPrefBranch.setIntPref("mail.show_headers",2);
-    MsgReload();
+    ReloadMessage();
     return true;
 }
 
 function MsgViewNormalHeaders()
 {
     gPrefBranch.setIntPref("mail.show_headers",1);
-    MsgReload();
+    ReloadMessage();
     return true;
 }
 
 function MsgViewBriefHeaders()
 {
     gPrefBranch.setIntPref("mail.show_headers",0);
-    MsgReload();
+    ReloadMessage();
     return true;
 }
 
 function MsgBodyAllowHTML()
 {
     gPrefBranch.setBoolPref("mailnews.display.prefer_plaintext", false);
     gPrefBranch.setIntPref("mailnews.display.html_as", 0);
     gPrefBranch.setIntPref("mailnews.display.disallow_mime_handlers", 0);
-    MsgReload();
+    ReloadMessage();
     return true;
 }
 
 function MsgBodySanitized()
 {
     gPrefBranch.setBoolPref("mailnews.display.prefer_plaintext", false);
     gPrefBranch.setIntPref("mailnews.display.html_as", 3);
     gPrefBranch.setIntPref("mailnews.display.disallow_mime_handlers",
                            disallow_classes_no_html);
-    MsgReload();
+    ReloadMessage();
     return true;
 }
 
 function MsgBodyAsPlaintext()
 {
     gPrefBranch.setBoolPref("mailnews.display.prefer_plaintext", true);
     gPrefBranch.setIntPref("mailnews.display.html_as", 1);
     gPrefBranch.setIntPref("mailnews.display.disallow_mime_handlers",
                            disallow_classes_no_html);
-    MsgReload();
+    ReloadMessage();
     return true;
 }
 
 function MsgFeedBodyRenderPrefs(plaintext, html, mime)
 {
   gPrefBranch.setBoolPref("rss.display.prefer_plaintext", plaintext);
   gPrefBranch.setIntPref("rss.display.html_as", html);
   gPrefBranch.setIntPref("rss.display.disallow_mime_handlers", mime);
@@ -1998,21 +1998,16 @@ function ChangeFeedShowSummaryPref(val)
 }
 
 function ToggleInlineAttachment(target)
 {
     var viewAttachmentInline = !pref.getBoolPref("mail.inline_attachments");
     pref.setBoolPref("mail.inline_attachments", viewAttachmentInline)
     target.setAttribute("checked", viewAttachmentInline ? "true" : "false");
     
-    MsgReload();
-}
-
-function MsgReload()
-{
     ReloadMessage();
 }
 
 function MsgStop()
 {
     StopUrls();
 }
 
@@ -2697,17 +2692,17 @@ function allowRemoteContentForSender()
     // create a new card and set the property
     window.openDialog("chrome://messenger/content/addressbook/abNewCardDialog.xul",
                       "", "chrome,resizable=no,titlebar,modal,centerscreen", args);
     allowRemoteContent = args.allowRemoteContent;
   } 
 
   // reload the message if we've updated the remote content policy for the sender  
   if (allowRemoteContent)
-    MsgReload();
+    ReloadMessage();
 }
 
 function MsgIsNotAScam()
 {
   // we want to get the msg hdr for the currently selected message
   // change the "isPhishingMsg" property on it
   // then reload the message
 
@@ -2718,17 +2713,17 @@ function setMsgHdrPropertyAndReload(aPro
 {
   // we want to get the msg hdr for the currently selected message
   // change the appropiate property on it then reload the message
 
   var msgHdr = msgHdrForCurrentMessage();
   if (msgHdr)
   {
     msgHdr.setUint32Property(aProperty, aValue);
-    MsgReload();
+    ReloadMessage();
   }
 }
 
 function checkMsgHdrPropertyIsNot(aProperty, aValue)
 {
   // we want to get the msg hdr for the currently selected message,
   // get the appropiate property on it and then test against value.
 
--- a/suite/mailnews/messageWindow.js
+++ b/suite/mailnews/messageWindow.js
@@ -906,17 +906,17 @@ var MessageWindowController =
 				break;
 			case "cmd_saveAsTemplate":
 				MsgSaveAsTemplate();
 				break;
 			case "cmd_viewPageSource":
 				MsgViewPageSource();
 				break;
 			case "cmd_reload":
-				MsgReload();
+				ReloadMessage();
 				break;
 			case "cmd_find":
 				MsgFind();
 				break;
 			case "cmd_findAgain":
 				MsgFindAgain(false);
 				break;
 			case "cmd_findPrev":
--- a/suite/mailnews/msgHdrViewOverlay.js
+++ b/suite/mailnews/msgHdrViewOverlay.js
@@ -289,17 +289,17 @@ const MsgHdrViewObserver =
   observe: function(subject, topic, prefName)
   {
     // verify that we're changing the mail pane config pref
     if (topic == "nsPref:changed")
     {
       if (prefName == "mail.showCondensedAddresses")
       {
         gShowCondensedEmailAddresses = pref.getBoolPref("mail.showCondensedAddresses");
-        MsgReload();
+        ReloadMessage();
       }
     }
   }
 };
 
 // The messageHeaderSink is the class that gets notified of a message's headers as we display the message
 // through our mime converter.