Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 85296, do the right thing when replying to a message from yourself, sr=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@184948 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bienvenu%nventure.com 2005-11-18 23:22:50 +00:00
parent 14f7c7454d
commit 850df227ce
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/mailnews/compose/src/nsMsgCompose.cpp
View File

@ -1773,19 +1773,31 @@ nsresult nsMsgCompose::CreateMessage(const char * originalMsgURI,
subject.Insert(NS_LITERAL_STRING("Re: "), 0);
m_compFields->SetSubject(subject);
nsXPIDLCString author, authorEmailAddress;
msgHdr->GetAuthor(getter_Copies(author));
nsCOMPtr<nsIMsgHeaderParser> parser (do_GetService(NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID));
if (parser) {
// convert to UTF8 before passing to MakeFullAddress
rv = parser->ExtractHeaderAddressMailboxes(nsnull, author.get(),
getter_Copies(authorEmailAddress));
}
nsXPIDLCString curIdentityEmail;
m_identity->GetEmail(getter_Copies(curIdentityEmail));
nsXPIDLCString author;
rv = msgHdr->GetAuthor(getter_Copies(author));
if (NS_FAILED(rv))
return rv;
nsXPIDLCString toField;
if (curIdentityEmail.Equals(authorEmailAddress))
msgHdr->GetRecipients(getter_Copies(toField));
else
toField.Assign(author);
rv = mimeConverter->DecodeMimeHeader(author,
rv = mimeConverter->DecodeMimeHeader(toField,
getter_Copies(decodedCString),
originCharset.get(), charsetOverride);
if (NS_SUCCEEDED(rv) && decodedCString)
m_compFields->SetTo(decodedCString);
else
m_compFields->SetTo(author);
m_compFields->SetTo(toField);
// Setup quoting callbacks for later...
mWhatHolder = 1;