Bug #266066 --> Replying or forwarding a message with inline images, fails to render images in the compose window.

sr=jst
This commit is contained in:
scott%scott-macgregor.org 2004-10-29 06:59:34 +00:00
parent 6bec37b9db
commit 3d9d9f5c63

View File

@ -522,7 +522,7 @@ nsMsgCompose::ConvertAndLoadComposeWindow(nsString& aPrefix,
nsIDocShell *docshell = nsnull;
nsCOMPtr<nsIScriptGlobalObject> globalObj = do_QueryInterface(m_window);
if (globalObj && (docshell = globalObj->GetDocShell()))
docshell->SetAppType(nsIDocShell::APP_TYPE_MAIL);
docshell->SetAppType(nsIDocShell::APP_TYPE_EDITOR);
if (aHTMLEditor && !mCiteReference.IsEmpty())
mailEditor->InsertAsCitedQuotation(aBuf,
@ -533,10 +533,6 @@ nsMsgCompose::ConvertAndLoadComposeWindow(nsString& aPrefix,
mailEditor->InsertAsQuotation(aBuf,
getter_AddRefs(nodeInserted));
// XXX see bug #206793
if (docshell)
docshell->SetAppType(nsIDocShell::APP_TYPE_EDITOR);
m_editor->EndOfDocument();
}
@ -2397,17 +2393,13 @@ QuotingOutputStreamListener::InsertToCompose(nsIEditor *aEditor,
if (globalObj)
docshell = globalObj->GetDocShell();
if (docshell)
docshell->SetAppType(nsIDocShell::APP_TYPE_MAIL);
docshell->SetAppType(nsIDocShell::APP_TYPE_EDITOR);
if (aHTMLEditor)
mailEditor->InsertAsCitedQuotation(mMsgBody, EmptyString(), PR_TRUE,
getter_AddRefs(nodeInserted));
else
mailEditor->InsertAsQuotation(mMsgBody, getter_AddRefs(nodeInserted));
// XXX see bug #206793
if (docshell)
docshell->SetAppType(nsIDocShell::APP_TYPE_EDITOR);
}
}