Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for PDT+ bug 23091 (Messages pref panel).submitted by mozilla@bucksch.org r=hangas a=phil

Browse Source
This commit is contained in:
hangas%netscape.com 2000-02-25 01:55:17 +00:00
parent c0db891fd9
commit 99011cea8f
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mailnews/compose/src/nsMsgSend.cpp
View File

@ -79,7 +79,7 @@ static NS_DEFINE_CID(kMimeServiceCID, NS_MIMESERVICE_CID);
static NS_DEFINE_CID(kCAddressCollecter, NS_ABADDRESSCOLLECTER_CID);
static NS_DEFINE_CID(kTXTToHTMLConvCID, MOZITXTTOHTMLCONV_CID);
#define PREF_MAIL_CONVERT_STRUCTS "mail.convert_structs"
#define PREF_MAIL_SEND_STRUCT "mail.send_struct"
#define PREF_MAIL_STRICTLY_MIME "mail.strictly_mime"
#define PREF_MAIL_MESSAGE_WARNING_SIZE "mailnews.message_warning_size"
@ -1247,7 +1247,7 @@ nsMsgComposeAndSend::GetBodyFromEditor()
NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv);
if (NS_SUCCEEDED(rv) && prefs)
{
rv = prefs->GetBoolPref(PREF_MAIL_CONVERT_STRUCTS,&enable_structs);
rv = prefs->GetBoolPref(PREF_MAIL_SEND_STRUCT,&enable_structs);
if (NS_FAILED(rv) || enable_structs)
whattodo = whattodo | mozITXTToHTMLConv::kStructPhrase;
}

5
mailnews/mailnews.js
View File

@ -380,8 +380,9 @@ pref("mail.server.default.max_articles", 500);
pref("mail.server.default.notify.on", true);
pref("mail.server.default.mark_old_read", false);
pref("mail.convert_emoticons",true);
pref("mail.convert_structs",true);
pref("mail.display_glyph",true); // see <http://www.bucksch.org/1/projects/mozilla/16507/>
pref("mail.display_struct",true); // dito
pref("mail.send_struct",true); // dito
pref("mail.forward_message_mode", 0); // 0=default as attachment 2=forward as inline with attachments, (obsolete)1=forward as quoted

9
mailnews/mime/src/nsStreamConverter.cpp
View File

@ -48,8 +48,9 @@
#include "nsNetUtil.h"
#include "mozITXTToHTMLConv.h"
#define PREF_MAIL_CONVERT_EMOTICONS "mail.convert_emoticons"
#define PREF_MAIL_CONVERT_STRUCTS "mail.convert_structs"
#define PREF_MAIL_DISPLAY_GLYPH "mail.display_glyph"
#define PREF_MAIL_DISPLAY_STRUCT "mail.display_struct"
#define PREF_MAIL_MIME_XUL_OUTPUT "mail.mime_xul_output"
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
@ -519,11 +520,11 @@ NS_IMETHODIMP nsStreamConverter::Init(nsIURI *aURI, nsIStreamListener * aOutList
NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv);
if (NS_SUCCEEDED(rv) && prefs) {
rv = prefs->GetBoolPref(PREF_MAIL_CONVERT_EMOTICONS,&enable_emoticons);
rv = prefs->GetBoolPref(PREF_MAIL_DISPLAY_GLYPH,&enable_emoticons);
if (NS_FAILED(rv) || enable_emoticons) {
whattodo = whattodo | mozITXTToHTMLConv::kGlyphSubstitution;
}
rv = prefs->GetBoolPref(PREF_MAIL_CONVERT_STRUCTS,&enable_structs);
rv = prefs->GetBoolPref(PREF_MAIL_DISPLAY_STRUCT,&enable_structs);
if (NS_FAILED(rv) || enable_structs) {
whattodo = whattodo | mozITXTToHTMLConv::kStructPhrase;
}

5
modules/libpref/src/init/mailnews.js
View File

@ -380,8 +380,9 @@ pref("mail.server.default.max_articles", 500);
pref("mail.server.default.notify.on", true);
pref("mail.server.default.mark_old_read", false);
pref("mail.convert_emoticons",true);
pref("mail.convert_structs",true);
pref("mail.display_glyph",true); // see <http://www.bucksch.org/1/projects/mozilla/16507/>
pref("mail.display_struct",true); // dito
pref("mail.send_struct",true); // dito
pref("mail.forward_message_mode", 0); // 0=default as attachment 2=forward as inline with attachments, (obsolete)1=forward as quoted