Bug 1028997 - Assertion failure in nsMsgAttachmentHandler.h, r=Neil a=bustage fix for CLOSED TREE
--- a/mailnews/compose/src/nsMsgAttachmentHandler.h
+++ b/mailnews/compose/src/nsMsgAttachmentHandler.h
@@ -63,17 +63,16 @@ class MimeEncoder;
//
class nsMsgAttachmentHandler
{
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(nsMsgAttachmentHandler)
typedef mozilla::mailnews::MimeEncoder MimeEncoder;
public:
nsMsgAttachmentHandler();
- ~nsMsgAttachmentHandler();
public:
nsresult SnarfAttachment(nsMsgCompFields *compFields);
nsresult PickEncoding(const char *charset, nsIMsgSend* mime_delivery_state);
nsresult PickCharset();
void AnalyzeSnarfedFile (); // Analyze a previously-snarfed file.
// (Currently only used for plaintext
// converted from HTML.)
nsresult Abort();
@@ -81,16 +80,17 @@ public:
// if there's an intermediate temp file left, takes care to remove it from disk.
//
// NOTE: this takes care of the mEncodedWorkingFile temp file, but not mTmpFile which seems
// to be used by lots of other classes at the moment.
void CleanupTempFile();
private:
+ ~nsMsgAttachmentHandler();
// use when a message (e.g. original message in a reply) is attached as a rfc822 attachment.
nsresult SnarfMsgAttachment(nsMsgCompFields *compFields);
bool UseUUEncode_p(void);
void AnalyzeDataChunk (const char *chunk, int32_t chunkSize);
nsresult LoadDataFromFile(nsIFile *file, nsString &sigData, bool charsetConversion); //A similar function already exist in nsMsgCompose!
#ifdef XP_MACOSX
nsresult ConvertToAppleEncoding(const nsCString &aFileSpecURI,