Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backing out to avoid horking verification builds. Let's try this again another time.

Browse Source
This commit is contained in:
gerv%gerv.net 2001-08-14 14:50:43 +00:00
parent e42458d3ce
commit 33139fb14b
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2525,6 +2525,7 @@ nsMsgCompose::ProcessSignature(nsIMsgIdentity *identity, nsString *aMsgBody)
// are doing plain text compose, we should insert some sort of message
// saying "Image Signature Omitted" or something.
//
nsAutoString urlStr;
nsXPIDLCString sigNativePath;
PRBool useSigFile = PR_FALSE;
PRBool htmlSig = PR_FALSE;
@ -2645,21 +2646,16 @@ nsMsgCompose::ProcessSignature(nsIMsgIdentity *identity, nsString *aMsgBody)
else
sigOutput.AppendWithConversion(CRLF);
nsAString& firstFourChars = Substring(sigData, 0, 4);
if (!(firstFourChars.Equals(NS_LITERAL_STRING("-- \n"))) ||
firstFourChars.Equals(NS_LITERAL_STRING("-- \r")))
{
sigOutput.AppendWithConversion(dashes);
if (!m_composeHTML || !htmlSig)
sigOutput.AppendWithConversion(CRLF);
else if (m_composeHTML)
sigOutput.AppendWithConversion(htmlBreak);
}
sigOutput.AppendWithConversion(dashes);
if ( (!m_composeHTML) || ((m_composeHTML) && (!htmlSig)) )
sigOutput.AppendWithConversion(CRLF);
else if (m_composeHTML)
sigOutput.AppendWithConversion(htmlBreak);
sigOutput.Append(sigData);
//DELETEME: I18N: Converting down (2byte->1byte) OK?
if (m_composeHTML)
{
if (htmlSig)