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

I forget to move the code that set identity fields into the compose fields when I split the send function last time.

Browse Source
This commit is contained in:
ducarroz%netscape.com 1999-07-07 00:37:47 +00:00
parent 4f17bd8597
commit 9f3b049d85
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mailnews/compose/src/nsMsgCompose.cpp
View File

@ -273,10 +273,24 @@ nsresult nsMsgCompose::_SendMsg(MSG_DeliverMode deliverMode,
if (m_compFields && identity)
{
// Pref values are supposed to be stored as UTF-8, so no conversion
nsXPIDLCString email;
nsXPIDLCString replyTo;
nsXPIDLCString organization;
identity->GetEmail(getter_Copies(email));
identity->GetReplyTo(getter_Copies(replyTo));
identity->GetOrganization(getter_Copies(organization));
m_compFields->SetFrom(NS_CONST_CAST(char*, (const char *)email));
m_compFields->SetReplyTo(NS_CONST_CAST(char*, (const char *)replyTo));
m_compFields->SetOrganization(NS_CONST_CAST(char*, (const char *)organization));
#ifdef DEBUG
printf("----------------------------\n");
printf("-- Sending Mail Message --\n");
printf("----------------------------\n");
printf("from: %s\n", m_compFields->GetFrom());
printf("To: %s Cc: %s Bcc: %s\n", m_compFields->GetTo(), m_compFields->GetCc(), m_compFields->GetBcc());
printf("Newsgroups: %s\n", m_compFields->GetNewsgroups());
printf("Subject: %s \nMsg: %s\n", m_compFields->GetSubject(), m_compFields->GetBody());
@ -385,19 +399,6 @@ nsMsgCompose::SendMsgEx(MSG_DeliverMode deliverMode,
nsString aCharset(msgCompHeaderInternalCharset());
char *outCString;
// Pref values are supposed to be stored as UTF-8, so no conversion
nsXPIDLCString email;
nsXPIDLCString replyTo;
nsXPIDLCString organization;
identity->GetEmail(getter_Copies(email));
identity->GetReplyTo(getter_Copies(replyTo));
identity->GetOrganization(getter_Copies(organization));
m_compFields->SetFrom(NS_CONST_CAST(char*, (const char *)email));
m_compFields->SetReplyTo(NS_CONST_CAST(char*, (const char *)replyTo));
m_compFields->SetOrganization(NS_CONST_CAST(char*, (const char *)organization));
// Convert fields to UTF-8
if (NS_SUCCEEDED(ConvertFromUnicode(aCharset, addrTo, &outCString)))
{