From 3e1963d01ea9ad3f5452af993a3959ef23693921 Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Wed, 12 May 2004 18:36:29 +0000 Subject: [PATCH] Bug #44494 -->remember the decision the user makes in the askSendFormat dialog so that we don't ask again. git-svn-id: svn://10.0.0.236/trunk@156310 18797224-902f-48f8-a5cc-f745e15eee43 --- .../compose/content/MsgComposeCommands.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mozilla/mail/components/compose/content/MsgComposeCommands.js b/mozilla/mail/components/compose/content/MsgComposeCommands.js index a7bbb16d167..7e303c73569 100644 --- a/mozilla/mail/components/compose/content/MsgComposeCommands.js +++ b/mozilla/mail/components/compose/content/MsgComposeCommands.js @@ -1723,6 +1723,13 @@ function GenericSendMessage( msgType ) return; action = result2.action; } + + // we will remember the users "send format" decision + // in the address collector code (see nsAbAddressCollecter::CollectAddress()) + // by using msgCompFields.forcePlainText and msgCompFields.useMultipartAlternative + // to determine the nsIAbPreferMailFormat (unknown, plaintext, or html) + // if the user sends both, we remember html. + switch (action) { case nsIMsgCompSendFormat.PlainText: @@ -2628,12 +2635,7 @@ function DetermineHTMLAction(convertible) dump("DetermineHTMLAction: preferFormat = " + preferFormat + ", noHtmlRecipients are " + noHtmlRecipients + "\n"); //Check newsgroups now... - try { - noHtmlnewsgroups = gMsgCompose.GetNoHtmlNewsgroups(null); - } catch(ex) - { - noHtmlnewsgroups = gMsgCompose.compFields.newsgroups; - } + noHtmlnewsgroups = gMsgCompose.compFields.newsgroups; if (noHtmlRecipients != "" || noHtmlnewsgroups != "") {