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

Rest of 29653: Use a valid "mid" URL as value for the cite attribute of <blockquote> instead of just the raw Msg-ID.

Browse Source
This commit is contained in:
mozilla.BenB%bucksch.org 2000-07-06 01:33:19 +00:00
parent 7087d3e436
commit 44e0bccbdb
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,7 @@
#include "nsIMIMEService.h"
#include "nsIDocShellTreeItem.h"
#include "nsIDocShellTreeOwner.h"
#include "nsIIOService.h"
// Defines....
static NS_DEFINE_CID(kMsgQuoteCID, NS_MSGQUOTE_CID);
@ -73,6 +74,7 @@ static NS_DEFINE_CID(kAddrBookCID, NS_ADDRESSBOOK_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kMsgRecipientArrayCID, NS_MSGRECIPIENTARRAY_CID);
static NS_DEFINE_CID(kMimeServiceCID, NS_MIMESERVICE_CID);
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
static PRInt32 GetReplyOnTop()
{
@ -248,11 +250,14 @@ nsresult nsMsgCompose::ConvertAndLoadComposeWindow(nsIEditorShell *aEditorShell,
if (!aBuf.IsEmpty())
{
if (!mCiteReference.IsEmpty())
aEditorShell->InsertAsCitedQuotation(aBuf.GetUnicode(), mCiteReference.GetUnicode(),
PR_TRUE,
NS_ConvertASCIItoUCS2("UTF-8").GetUnicode(), getter_AddRefs(nodeInserted));
aEditorShell->InsertAsCitedQuotation(aBuf.GetUnicode(),
mCiteReference.GetUnicode(),
PR_TRUE,
NS_ConvertASCIItoUCS2("UTF-8").GetUnicode(),
getter_AddRefs(nodeInserted));
else
aEditorShell->InsertAsQuotation(aBuf.GetUnicode(), getter_AddRefs(nodeInserted));
aEditorShell->InsertAsQuotation(aBuf.GetUnicode(),
getter_AddRefs(nodeInserted));
}
if (!aSignature.IsEmpty())
@ -1153,16 +1158,29 @@ QuotingOutputStreamListener::QuotingOutputStreamListener(const PRUnichar * origi
if (originalMsg && !quoteHeaders)
{
nsresult rv;
nsXPIDLString author;
// Setup the cite information....
char *msgID = nsnull;
if (NS_SUCCEEDED(originalMsg->GetMessageId(&msgID)) && msgID)
nsXPIDLCString myGetter;
if (NS_SUCCEEDED(originalMsg->GetMessageId(getter_Copies(myGetter))))
{
mCiteReference.AssignWithConversion(msgID);
PR_FREEIF(msgID);
nsCString unencodedURL(myGetter);
// would be nice, if nsXPIDL*String were ns*String
NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv)
if (!unencodedURL.IsEmpty() && NS_SUCCEEDED(rv) && serv)
{
if (NS_SUCCEEDED(serv->Escape(unencodedURL.GetBuffer(),
nsIIOService::url_FileBaseName | nsIIOService::url_Forced,
getter_Copies(myGetter))))
{
mCiteReference.AssignWithConversion(myGetter);
mCiteReference.Insert(NS_LITERAL_STRING("mid:"), 0);
}
else
mCiteReference.Truncate();
}
}
nsXPIDLString author;
rv = originalMsg->GetMime2DecodedAuthor(getter_Copies(author));
if (NS_SUCCEEDED(rv))
{