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

Do not add "-- \n" to signature if it's already in the sig file. Bug 30208. r=bratell, sr=sspitzer.

Browse Source
This commit is contained in:
gerv%gerv.net 2001-08-14 13:33:59 +00:00
parent e1d4f83235
commit 11792134c4
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2525,7 +2525,6 @@ 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;
@ -2646,16 +2645,21 @@ nsMsgCompose::ProcessSignature(nsIMsgIdentity *identity, nsString *aMsgBody)
else
sigOutput.AppendWithConversion(CRLF);
sigOutput.AppendWithConversion(dashes);
if ( (!m_composeHTML) || ((m_composeHTML) && (!htmlSig)) )
sigOutput.AppendWithConversion(CRLF);
else if (m_composeHTML)
sigOutput.AppendWithConversion(htmlBreak);
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.Append(sigData);
//DELETEME: I18N: Converting down (2byte->1byte) OK?
if (m_composeHTML)
{
if (htmlSig)