Removed reference to message owner from part.

10 files changed, 0 insertions, 71 deletions

diff --git a/src/core/abstract/MCAbstractMessagePart.cc b/src/core/abstract/MCAbstractMessagePart.cc
index 649fcc32..d2cb232e 100644
--- a/src/core/abstract/MCAbstractMessagePart.cc
+++ b/src/core/abstract/MCAbstractMessagePart.cc
@@ -66,21 +66,6 @@ AbstractPart * AbstractMessagePart::mainPart()
 void AbstractMessagePart::setMainPart(AbstractPart * mainPart)
 {
     MC_SAFE_REPLACE_RETAIN(AbstractPart, mMainPart, mainPart);
-    applyMessage();
-}
-
-void AbstractMessagePart::applyMessage()
-{
-    if (mMainPart == NULL)
-        return;
-    
-    mMainPart->setMessage(message());
-}
-
-void AbstractMessagePart::setMessage(AbstractMessage * message)
-{
-    AbstractPart::setMessage(message);
-    applyMessage();
 }
 
 AbstractPart * AbstractMessagePart::partForContentID(String * contentID)
diff --git a/src/core/abstract/MCAbstractMessagePart.h b/src/core/abstract/MCAbstractMessagePart.h
index 1ff1def6..bd2ac4e0 100644
--- a/src/core/abstract/MCAbstractMessagePart.h
+++ b/src/core/abstract/MCAbstractMessagePart.h
@@ -27,8 +27,6 @@ namespace mailcore {
 		virtual String * description();
 		virtual Object * copy();
         
-		virtual void setMessage(AbstractMessage * message);
-        
         virtual AbstractPart * partForContentID(String * contentID);
         virtual AbstractPart * partForUniqueID(String * uniqueID);
         
@@ -36,7 +34,6 @@ namespace mailcore {
 		AbstractPart * mMainPart;
 		MessageHeader * mHeader;
 		void init();
-		void applyMessage();
 	};
 }
 
diff --git a/src/core/abstract/MCAbstractMultipart.cc b/src/core/abstract/MCAbstractMultipart.cc
index 7a2f551e..d70b2974 100644
--- a/src/core/abstract/MCAbstractMultipart.cc
+++ b/src/core/abstract/MCAbstractMultipart.cc
@@ -39,7 +39,6 @@ Array * AbstractMultipart::parts()
 void AbstractMultipart::setParts(Array * parts)
 {
     MC_SAFE_REPLACE_COPY(Array, mParts, parts);
-    applyMessage();
 }
 
 String * AbstractMultipart::description()
@@ -70,23 +69,6 @@ Object * AbstractMultipart::copy()
     return new AbstractMultipart(this);
 }
 
-void AbstractMultipart::applyMessage()
-{
-    if (mParts == NULL)
-        return;
-    
-    for(unsigned int i = 0 ; i < mParts->count() ; i ++) {
-        AbstractPart * part = (AbstractPart *) mParts->objectAtIndex(i);
-        part->setMessage(message());
-    }
-}
-
-void AbstractMultipart::setMessage(AbstractMessage * message)
-{
-    AbstractPart::setMessage(message);
-    applyMessage();
-}
-
 AbstractPart * AbstractMultipart::partForContentID(String * contentID)
 {
     for(unsigned int i = 0 ; i < parts()->count() ; i ++) {
diff --git a/src/core/abstract/MCAbstractMultipart.h b/src/core/abstract/MCAbstractMultipart.h
index da77f9a6..11d33666 100644
--- a/src/core/abstract/MCAbstractMultipart.h
+++ b/src/core/abstract/MCAbstractMultipart.h
@@ -22,14 +22,12 @@ namespace mailcore {
 		virtual String * description();
 		virtual Object * copy();
         
-		virtual void setMessage(AbstractMessage * message);
         virtual AbstractPart * partForContentID(String * contentID);
         virtual AbstractPart * partForUniqueID(String * uniqueID);
 		
 	private:
 		Array * mParts;
 		void init();
-		void applyMessage();
 	};
 }
 
diff --git a/src/core/abstract/MCAbstractPart.cc b/src/core/abstract/MCAbstractPart.cc
index a1cf57b0..6991e5fc 100644
--- a/src/core/abstract/MCAbstractPart.cc
+++ b/src/core/abstract/MCAbstractPart.cc
@@ -160,16 +160,6 @@ void AbstractPart::setInlineAttachment(bool inlineAttachment)
     mInlineAttachment = inlineAttachment;
 }
 
-AbstractMessage * AbstractPart::message()
-{
-    return mMessage;
-}
-
-void AbstractPart::setMessage(AbstractMessage * message)
-{
-    mMessage = message;
-}
-
 void AbstractPart::importIMAPFields(struct mailimap_body_fields * fields,
     struct mailimap_body_ext_1part * extension)
 {
diff --git a/src/core/abstract/MCAbstractPart.h b/src/core/abstract/MCAbstractPart.h
index fe8a57d5..b38c1b38 100644
--- a/src/core/abstract/MCAbstractPart.h
+++ b/src/core/abstract/MCAbstractPart.h
@@ -40,9 +40,6 @@ namespace mailcore {
 		virtual bool isInlineAttachment();
 		virtual void setInlineAttachment(bool inlineAttachment);
 		
-		virtual AbstractMessage * message();
-		virtual void setMessage(AbstractMessage * message);
-		
         virtual AbstractPart * partForContentID(String * contentID);
         virtual AbstractPart * partForUniqueID(String * uniqueID);
         
@@ -67,7 +64,6 @@ namespace mailcore {
 		String * mContentLocation;
 		bool mInlineAttachment;
 		PartType mPartType;
-		AbstractMessage * mMessage; // weak
 		void init();
 	};
 	
diff --git a/src/core/rfc822/MCMessageBuilder.cc b/src/core/rfc822/MCMessageBuilder.cc
index f8fe0064..435557db 100644
--- a/src/core/rfc822/MCMessageBuilder.cc
+++ b/src/core/rfc822/MCMessageBuilder.cc
@@ -553,12 +553,6 @@ String * MessageBuilder::textBody()
 
 void MessageBuilder::setAttachments(Array * attachments)
 {
-    if (attachments != NULL) {
-        for(unsigned int i = 0 ; i < attachments->count() ; i ++) {
-            Attachment * attachment = (Attachment *) attachments->objectAtIndex(i);
-            attachment->setMessage(this);
-        }
-    }
     MC_SAFE_REPLACE_COPY(Array, mAttachments, attachments);
 }
 
@@ -572,18 +566,11 @@ void MessageBuilder::addAttachment(Attachment * attachment)
     if (mAttachments == NULL) {
         mAttachments = new Array();
     }
-    attachment->setMessage(this);
     mAttachments->addObject(attachment);
 }
 
 void MessageBuilder::setRelatedAttachments(Array * attachments)
 {
-    if (attachments != NULL) {
-        for(unsigned int i = 0 ; i < attachments->count() ; i ++) {
-            Attachment * attachment = (Attachment *) attachments->objectAtIndex(i);
-            attachment->setMessage(this);
-        }
-    }
     MC_SAFE_REPLACE_COPY(Array, mRelatedAttachments, attachments);
 }
 
@@ -597,7 +584,6 @@ void MessageBuilder::addRelatedAttachment(Attachment * attachment)
     if (mRelatedAttachments == NULL) {
         mRelatedAttachments = new Array();
     }
-    attachment->setMessage(this);
     mRelatedAttachments->addObject(attachment);
 }
 
diff --git a/src/core/rfc822/MCMessageParser.cc b/src/core/rfc822/MCMessageParser.cc
index 2a892e6b..b936fabf 100644
--- a/src/core/rfc822/MCMessageParser.cc
+++ b/src/core/rfc822/MCMessageParser.cc
@@ -37,7 +37,6 @@ MessageParser::MessageParser(Data * data)
 	msg = data_message_init(data->bytes(), data->length());
 	mailmessage_get_bodystructure(msg, &mime);
     mMainPart = (AbstractPart *) Attachment::attachmentsWithMIME(msg->msg_mime)->retain();
-    mMainPart->setMessage(this);
     mMainPart->applyUniquePartID();
     header()->importIMFFields(msg->msg_fields);
 	mailmessage_free(msg);
diff --git a/src/objc/abstract/MCOAbstractPart.h b/src/objc/abstract/MCOAbstractPart.h
index 0269347a..a3ab44f6 100644
--- a/src/objc/abstract/MCOAbstractPart.h
+++ b/src/objc/abstract/MCOAbstractPart.h
@@ -66,9 +66,6 @@ typedef enum {
 /** Returns whether the part is an explicit inline attachment.*/
 @property (nonatomic, assign, getter=isInlineAttachment) BOOL inlineAttachment;
 
-/** Returns the owner message of the part.*/
-@property (nonatomic, weak) MCOAbstractMessage * message;
-
 /** Returns the part with the given Content-ID among this part and its subparts.*/
 - (MCOAbstractPart *) partForContentID:(NSString *)contentID;
 
diff --git a/src/objc/abstract/MCOAbstractPart.mm b/src/objc/abstract/MCOAbstractPart.mm
index 47191ce9..8b2b008d 100644
--- a/src/objc/abstract/MCOAbstractPart.mm
+++ b/src/objc/abstract/MCOAbstractPart.mm
@@ -57,7 +57,6 @@ MCO_OBJC_SYNTHESIZE_STRING(setUniqueID, uniqueID)
 MCO_OBJC_SYNTHESIZE_STRING(setContentID, contentID)
 MCO_OBJC_SYNTHESIZE_STRING(setContentLocation, contentLocation)
 MCO_OBJC_SYNTHESIZE_BOOL(setInlineAttachment, isInlineAttachment)
-MCO_OBJC_SYNTHESIZE(AbstractMessage, setMessage, message)
 
 - (MCOAbstractPart *) partForContentID:(NSString *)contentID
 {