Bug 1028997 - Assertion failure in nsMsgAttachmentHandler.h, r=Neil a=bustage fix for CLOSED TREE
authorNihanth Subramanya <nhnt11@gmail.com>
Mon, 23 Jun 2014 22:19:50 +0530
changeset 20345 c8c1e9ea06c9c7044b803b3fd5f6ca59fe1aa54d
parent 20344 9780273e0c516f91e001f147301bd53b525d0692
child 20346 4fb400d27d7a7718ec95e72e592019e19fc20f59
push id1209
push usermbanner@mozilla.com
push dateTue, 02 Sep 2014 16:59:36 +0000
treeherdercomm-beta@842e0fd167ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersNeil, bustage
bugs1028997
Bug 1028997 - Assertion failure in nsMsgAttachmentHandler.h, r=Neil a=bustage fix for CLOSED TREE
mailnews/compose/src/nsMsgAttachmentHandler.h
--- 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,