From 55b9838dc43439e60433e9b56c1c2c2e9463917f Mon Sep 17 00:00:00 2001 From: "rhp%netscape.com" Date: Tue, 5 Oct 1999 00:03:20 +0000 Subject: [PATCH] Fixes for bug #15363 and #14675 - reviewer bienvenu git-svn-id: svn://10.0.0.236/trunk@49754 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp | 2 -- mozilla/mailnews/mime/src/nsMimeURLUtils.cpp | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp index 89b574b2f71..ffcd3f890aa 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp +++ b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp @@ -100,8 +100,6 @@ static PRBool needsQuotedPrintable (const char *s) while (*p) { if (*p & 0x80) return PR_TRUE; - else - return PR_FALSE; p++; } diff --git a/mozilla/mailnews/mime/src/nsMimeURLUtils.cpp b/mozilla/mailnews/mime/src/nsMimeURLUtils.cpp index f3cecea9746..ca05fd4baca 100644 --- a/mozilla/mailnews/mime/src/nsMimeURLUtils.cpp +++ b/mozilla/mailnews/mime/src/nsMimeURLUtils.cpp @@ -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