fix for bug 660019, a=standard8
authorDavid Bienvenu <bienvenu@nventure.com>
Tue, 26 Jul 2011 14:15:05 -0700
changeset 8310 395d2c74f7b052716f667688b9f896842d8a2212
parent 8309 808d304bffad6e8ba404365dadd72ccb617819cc
child 8311 12b3fc9c38d05f0cc9d6a7ac9d31771c6fde0222
push id84
push userbugzilla@standard8.plus.com
push dateTue, 16 Aug 2011 21:25:04 +0000
treeherdercomm-beta@6970c86be3cd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstandard8
bugs660019
fix for bug 660019, a=standard8
mailnews/base/util/nsMsgProtocol.cpp
mailnews/base/util/nsMsgProtocol.h
--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -659,24 +659,24 @@ NS_IMETHODIMP nsMsgProtocol::GetContentT
 NS_IMETHODIMP nsMsgProtocol::SetContentType(const nsACString &aContentType)
 {
     nsCAutoString charset;
     return NS_ParseContentType(aContentType, m_ContentType, charset);
 }
 
 NS_IMETHODIMP nsMsgProtocol::GetContentCharset(nsACString &aContentCharset)
 {
-  aContentCharset = m_contentCharset;
+  aContentCharset.Truncate();
   return NS_OK;
 }
 
 NS_IMETHODIMP nsMsgProtocol::SetContentCharset(const nsACString &aContentCharset)
 {
-  m_contentCharset = aContentCharset;
-  return NS_OK;
+  NS_WARNING("nsMsgProtocol::SetContentCharset() not implemented");
+  return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsMsgProtocol::GetContentLength(PRInt32 *aContentLength)
 {
   *aContentLength = mContentLength;
   return NS_OK;
 }
 
--- a/mailnews/base/util/nsMsgProtocol.h
+++ b/mailnews/base/util/nsMsgProtocol.h
@@ -186,17 +186,16 @@ protected:
   nsCOMPtr<nsISupports>        m_channelContext;
   nsCOMPtr<nsILoadGroup>      m_loadGroup;
   nsLoadFlags                 mLoadFlags;
   nsCOMPtr<nsIProgressEventSink> mProgressEventSink;
   nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
   nsCOMPtr<nsISupports>       mOwner;
   nsCString                   m_ContentType;
   PRInt32                     mContentLength;
-  nsCString                   m_contentCharset;
 
   nsCString m_lastPasswordSent; // used to prefill the password prompt
 
   // private helper routine used by subclasses to quickly get a reference to the correct prompt dialog
   // for a mailnews url. 
   nsresult GetPromptDialogFromUrl(nsIMsgMailNewsUrl * aMsgUrl, nsIPrompt ** aPromptDialog);
 
   // if a url isn't going to result in any content then we want to suppress calls to