Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 10:43:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing accidental behavior change from my checkin for bug #85271. This patch is r=dbaron. Restores the correct return value for the function (|NS_OK| when no converter is found).

Browse Source
This commit is contained in:
scc%mozilla.org 2001-06-17 06:17:12 +00:00
parent 2f60afe8ed
commit a5e3f194e4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
View File

@ -329,7 +329,7 @@ nsMimeHtmlDisplayEmitter::StartAttachment(const char *name, const char *contentT
// we emit it...
nsXPIDLString unicodeHeaderValue;
rv = NS_ERROR_FAILURE;
rv = NS_ERROR_FAILURE; // use failure to mean that we couldn't decode
if (mUnicodeConverter)
rv = mUnicodeConverter->DecodeMimeHeader(name,
getter_Copies(unicodeHeaderValue));
@ -337,6 +337,10 @@ nsMimeHtmlDisplayEmitter::StartAttachment(const char *name, const char *contentT
if (NS_FAILED(rv))
{
unicodeHeaderValue.Adopt(ToNewUnicode(nsDependentCString(name)));
// but it's not really a failure if we didn't have a converter in the first place
if ( !mUnicodeConverter )
rv = NS_OK;
}
headerSink->HandleAttachment(contentType, url /* was escapedUrl */, unicodeHeaderValue, uriString, aNotDownloaded);