Bug 1212510 Bustage fix: Rename NS_ParseContentType to NS_ParseResponseContentType (caused by
Bug 1210302), r=jcranmer, a=rkent
--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -576,17 +576,17 @@ NS_IMETHODIMP nsMsgProtocol::GetContentT
else
aContentType = m_ContentType;
return NS_OK;
}
NS_IMETHODIMP nsMsgProtocol::SetContentType(const nsACString &aContentType)
{
nsAutoCString charset;
- nsresult rv = NS_ParseContentType(aContentType, m_ContentType, charset);
+ nsresult rv = NS_ParseResponseContentType(aContentType, m_ContentType, charset);
if (NS_FAILED(rv) || m_ContentType.IsEmpty())
m_ContentType.AssignLiteral(UNKNOWN_CONTENT_TYPE);
return rv;
}
NS_IMETHODIMP nsMsgProtocol::GetContentCharset(nsACString &aContentCharset)
{
aContentCharset.Truncate();
--- a/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mailnews/imap/src/nsImapProtocol.cpp
@@ -9481,17 +9481,17 @@ NS_IMETHODIMP nsImapMockChannel::GetCont
else
aContentType = m_ContentType;
return NS_OK;
}
NS_IMETHODIMP nsImapMockChannel::SetContentType(const nsACString &aContentType)
{
nsAutoCString charset;
- nsresult rv = NS_ParseContentType(aContentType, m_ContentType, charset);
+ nsresult rv = NS_ParseResponseContentType(aContentType, m_ContentType, charset);
if (NS_FAILED(rv) || m_ContentType.IsEmpty())
m_ContentType.AssignLiteral(UNKNOWN_CONTENT_TYPE);
return rv;
}
NS_IMETHODIMP nsImapMockChannel::GetContentCharset(nsACString &aContentCharset)
{
aContentCharset.Truncate();
--- a/mailnews/news/src/nsNntpMockChannel.cpp
+++ b/mailnews/news/src/nsNntpMockChannel.cpp
@@ -197,17 +197,17 @@ NS_IMETHODIMP nsNntpMockChannel::GetCont
FORWARD_CALL(GetContentType, aContentType)
aContentType = m_contentType;
return NS_OK;
}
NS_IMETHODIMP nsNntpMockChannel::SetContentType(const nsACString &aContentType)
{
FORWARD_CALL(SetContentType, aContentType)
- return NS_ParseContentType(aContentType, m_contentType, m_contentCharset);
+ return NS_ParseResponseContentType(aContentType, m_contentType, m_contentCharset);
}
NS_IMETHODIMP nsNntpMockChannel::GetContentCharset(nsACString &aCharset)
{
FORWARD_CALL(GetContentCharset, aCharset)
aCharset = m_contentCharset;
return NS_OK;
}