From 74f9ae8cc142131fbfe5a043320ad17119b5a49a Mon Sep 17 00:00:00 2001 From: "mkmelin+mozilla%iki.fi" Date: Thu, 4 Oct 2007 18:13:01 +0000 Subject: [PATCH] [Bug 301291] Forward-inline ignores outgoing-charset preference r=bienvenu, sr=mscott, p=Petr Hroudny git-svn-id: svn://10.0.0.236/trunk@237271 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/compose/src/nsMsgCompose.cpp | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp index 7116d0a7958..6b958d91c58 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -1673,7 +1673,29 @@ nsresult nsMsgCompose::CreateMessage(const char * originalMsgURI, // If we are forwarding inline, mime did already setup the compose fields therefore we should stop now if (type == nsIMsgCompType::ForwardInline ) + { + // use send_default_charset if reply_in_default_charset is on. + nsCOMPtr prefs (do_GetService(NS_PREFSERVICE_CONTRACTID)); + if (prefs) + { + PRBool replyInDefault = PR_FALSE; + prefs->GetBoolPref("mailnews.reply_in_default_charset", + &replyInDefault); + if (replyInDefault) + { + nsString str; + nsCString charset; + NS_GetLocalizedUnicharPreferenceWithDefault(prefs, "mailnews.send_default_charset", + EmptyString(), str); + if (!str.IsEmpty()) + { + LossyCopyUTF16toASCII(str, charset); + m_compFields->SetCharacterSet(charset.get()); + } + } + } return rv; + } char *uriList = PL_strdup(originalMsgURI); if (!uriList)