Fixes for bug #15363 and #14675 - reviewer bienvenu

git-svn-id: svn://10.0.0.236/trunk@49754 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rhp%netscape.com
1999-10-05 00:03:20 +00:00
parent 81d2477caa
commit 55b9838dc4
2 changed files with 4 additions and 2 deletions

View File

@@ -100,8 +100,6 @@ static PRBool needsQuotedPrintable (const char *s)
while (*p) {
if (*p & 0x80)
return PR_TRUE;
else
return PR_FALSE;
p++;
}

View File

@@ -565,6 +565,10 @@ nsMimeURLUtils::ScanForURLs(const char *input, PRInt32 input_size,
if (NS_SUCCEEDED(rv) && prefs)
prefs->GetBoolPref("mail.do_glyph_substitution", &do_glyph_substitution);
// We shouldn't do the fun smiley stuff if we are only looking for URL's
if (urls_only)
do_glyph_substitution = PR_FALSE;
mailToTag = FindAmbitiousMailToTag(input, (PRInt32)input_size);
/* Normal lines are scanned for buried references to URL's