зеркало из https://github.com/mozilla/gecko-dev.git
Fixing solaris bustage.
This commit is contained in:
Родитель
dd8cbedbee
Коммит
deac8d7850
|
@ -363,11 +363,12 @@ MimeInlineTextPlainFlowed_parse_line (char *line, PRInt32 length, MimeObject *ob
|
||||||
|
|
||||||
nsAutoString ustr;
|
nsAutoString ustr;
|
||||||
nsCAutoString cstr;
|
nsCAutoString cstr;
|
||||||
|
nsCAutoString mailCharsetStr(mailCharset);
|
||||||
|
|
||||||
cstr.Assign(newcstr);
|
cstr.Assign(newcstr);
|
||||||
Recycle(newcstr);
|
Recycle(newcstr);
|
||||||
|
|
||||||
rv = nsMsgI18NConvertToUnicode((nsCAutoString) mailCharset, cstr, ustr);
|
rv = nsMsgI18NConvertToUnicode(mailCharsetStr, cstr, ustr);
|
||||||
if (NS_SUCCEEDED(rv))
|
if (NS_SUCCEEDED(rv))
|
||||||
{
|
{
|
||||||
PRUnichar *u;
|
PRUnichar *u;
|
||||||
|
@ -376,7 +377,7 @@ MimeInlineTextPlainFlowed_parse_line (char *line, PRInt32 length, MimeObject *ob
|
||||||
{
|
{
|
||||||
ustr.Assign(u);
|
ustr.Assign(u);
|
||||||
Recycle(u);
|
Recycle(u);
|
||||||
rv = nsMsgI18NConvertFromUnicode((nsCAutoString) mailCharset, ustr, cstr);
|
rv = nsMsgI18NConvertFromUnicode(mailCharsetStr, ustr, cstr);
|
||||||
if (NS_SUCCEEDED(rv))
|
if (NS_SUCCEEDED(rv))
|
||||||
lineResult.AssignWithConversion(cstr); // create nsString which contains NON unicode
|
lineResult.AssignWithConversion(cstr); // create nsString which contains NON unicode
|
||||||
// as the following code expecting it
|
// as the following code expecting it
|
||||||
|
|
|
@ -447,8 +447,9 @@ MimeInlineTextPlain_parse_line (char *line, PRInt32 length, MimeObject *obj)
|
||||||
// convert to unicode so it won't confuse ScanTXT.
|
// convert to unicode so it won't confuse ScanTXT.
|
||||||
nsAutoString ustr;
|
nsAutoString ustr;
|
||||||
nsCAutoString cstr(line, length);
|
nsCAutoString cstr(line, length);
|
||||||
|
nsCAutoString mailCharsetStr(mailCharset);
|
||||||
|
|
||||||
rv = nsMsgI18NConvertToUnicode((nsCAutoString) mailCharset, cstr, ustr);
|
rv = nsMsgI18NConvertToUnicode(mailCharsetStr, cstr, ustr);
|
||||||
if (NS_SUCCEEDED(rv))
|
if (NS_SUCCEEDED(rv))
|
||||||
{
|
{
|
||||||
PRUnichar *u;
|
PRUnichar *u;
|
||||||
|
@ -457,7 +458,7 @@ MimeInlineTextPlain_parse_line (char *line, PRInt32 length, MimeObject *obj)
|
||||||
{
|
{
|
||||||
ustr.Assign(u);
|
ustr.Assign(u);
|
||||||
Recycle(u);
|
Recycle(u);
|
||||||
rv = nsMsgI18NConvertFromUnicode((nsCAutoString) mailCharset, ustr, cstr);
|
rv = nsMsgI18NConvertFromUnicode(mailCharsetStr, ustr, cstr);
|
||||||
if (NS_SUCCEEDED(rv))
|
if (NS_SUCCEEDED(rv))
|
||||||
{
|
{
|
||||||
// create PRUnichar* which contains NON unicode
|
// create PRUnichar* which contains NON unicode
|
||||||
|
|
Загрузка…
Ссылка в новой задаче