Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=137071 [UE] Replies to or forwarding S/MIME encrypted mail should default to encrypt

Browse Source 
Additional required patch, to fix "forward inline".
Patch created by ducarroz.
r=kaie sr=mscott
This commit is contained in:
kaie%netscape.com 2002-06-21 14:04:57 +00:00
parent 7aca213491
commit 0eea589942
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mailnews/mime/src/mimedrft.cpp
View File

@ -200,11 +200,12 @@ mime_dump_attachments ( nsMsgAttachmentData *attachData )
#endif
nsresult
CreateTheComposeWindow(nsIMsgCompFields *compFields,
nsMsgAttachmentData *attachmentList,
MSG_ComposeType composeType,
CreateTheComposeWindow(nsIMsgCompFields * compFields,
nsMsgAttachmentData *attachmentList,
MSG_ComposeType composeType,
MSG_ComposeFormat composeFormat,
nsIMsgIdentity * identity
nsIMsgIdentity * identity,
char * originalMsgURI
)
{
nsresult rv;
@ -272,7 +273,14 @@ mime_dump_attachments ( attachmentList );
pMsgComposeParams->SetType(composeType);
pMsgComposeParams->SetFormat(format);
pMsgComposeParams->SetIdentity(identity);
pMsgComposeParams->SetComposeFields(compFields);
pMsgComposeParams->SetComposeFields(compFields);
//Lets cleanup the URI
nsCAutoString msgURI(originalMsgURI);
PRInt32 i = msgURI.FindChar('?');
if (i != kNotFound)
msgURI.Truncate(i);
pMsgComposeParams->SetOriginalMsgURI(msgURI.get());
rv = msgComposeService->OpenComposeWindowWithParams(nsnull /* default chrome */, pMsgComposeParams);
}
@ -1537,7 +1545,7 @@ mime_parse_stream_complete (nsMIMESession *stream)
#ifdef NS_DEBUG
printf("RICHIE: Time to create the EDITOR with this template - HAS a body!!!!\n");
#endif
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::Template, composeFormat, mdd->identity);
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::Template, composeFormat, mdd->identity, mdd->url_name);
}
else
{
@ -1545,11 +1553,11 @@ mime_parse_stream_complete (nsMIMESession *stream)
printf("Time to create the composition window WITH a body!!!!\n");
#endif
if (mdd->forwardInline)
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::ForwardInline, composeFormat, mdd->identity);
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::ForwardInline, composeFormat, mdd->identity, mdd->url_name);
else
{
fields->SetDraftId(mdd->url_name);
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::Draft, composeFormat, mdd->identity);
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::Draft, composeFormat, mdd->identity, mdd->url_name);
}
}
}
@ -1564,7 +1572,7 @@ mime_parse_stream_complete (nsMIMESession *stream)
#ifdef NS_DEBUG
printf("RICHIE: Time to create the EDITOR with this template - NO body!!!!\n");
#endif
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::Template, nsIMsgCompFormat::Default, mdd->identity);
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::Template, nsIMsgCompFormat::Default, mdd->identity, mdd->url_name);
}
else
{
@ -1572,11 +1580,11 @@ mime_parse_stream_complete (nsMIMESession *stream)
printf("Time to create the composition window WITHOUT a body!!!!\n");
#endif
if (mdd->forwardInline)
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::ForwardInline, nsIMsgCompFormat::Default, mdd->identity);
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::ForwardInline, nsIMsgCompFormat::Default, mdd->identity, mdd->url_name);
else
{
fields->SetDraftId(mdd->url_name);
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::Draft, nsIMsgCompFormat::Default, mdd->identity);
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::Draft, nsIMsgCompFormat::Default, mdd->identity, mdd->url_name);
}
}
}
@ -1590,7 +1598,7 @@ mime_parse_stream_complete (nsMIMESession *stream)
mdd->mailcharset,
getter_AddRefs(fields));
if (fields)
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::New, nsIMsgCompFormat::Default, mdd->identity);
CreateTheComposeWindow(fields, newAttachData, nsIMsgCompType::New, nsIMsgCompFormat::Default, mdd->identity, mdd->url_name);
}
if ( mdd->headers )