From 27937ec41f94720ffded271dff901dc74712845b Mon Sep 17 00:00:00 2001 From: Michael Zucci Date: Mon, 24 Apr 2000 09:12:31 +0000 Subject: Big fixes for the last commit which broke the message creation entirely. Plus an address decoder/formatter, etc. * camel-mime-message.c (construct_from_parser): Allow MESSAGE_END _or_ EOF as valid termination conditions. * providers/mbox/camel-mbox-summary.c (message_struct_new): Decode and then re-encode the addresses, so they are consistently formatted. * camel-mime-utils.c (header_decode_mailbox): Store the address in a _header_address. And try to get a comment-stored name if there is one. (header_decode_address): Actually return an address. (header_to_decode): Renamed to header_address_decode() (header_mailbox_decode): New function to get a single mailbox. (header_mime_decode): Return the major/minor value, as appropriate. (header_address_new, and friends): Whole bunch of utility functions for working with the address thingies. (header_decode_domain): Free the string header, and dont expand '.' into ' . '. (camel_mime_part_construct_content_from_parser): Oops, this was totally screwed up, try creating the right cotnent on the right object. svn path=/trunk/; revision=2579 --- camel/camel-mime-part-utils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'camel/camel-mime-part-utils.c') diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c index 460a6c7d03..50e9fd29d5 100644 --- a/camel/camel-mime-part-utils.c +++ b/camel/camel-mime-part-utils.c @@ -104,7 +104,6 @@ simple_data_wrapper_construct_from_parser(CamelDataWrapper *dw, CamelMimeParser buffer = g_byte_array_new(); - /* write to a memory buffer or something??? */ start = camel_mime_parser_tell(mp); while ( camel_mime_parser_step(mp, &buf, &len) != HSCAN_BODY_END ) { if (buffer) { @@ -174,11 +173,12 @@ camel_mime_part_construct_content_from_parser(CamelMimePart *dw, CamelMimeParser case HSCAN_HEADER: d(printf("Creating body part\n")); content = (CamelDataWrapper *)camel_simple_data_wrapper_new(); + simple_data_wrapper_construct_from_parser(content, mp); break; case HSCAN_MESSAGE: d(printf("Creating message part\n")); content = (CamelDataWrapper *)camel_mime_message_new(); - simple_data_wrapper_construct_from_parser(content, mp); + camel_mime_part_construct_from_parser((CamelMimePart *)content, mp); break; case HSCAN_MULTIPART: { CamelDataWrapper *bodypart; @@ -193,8 +193,10 @@ camel_mime_part_construct_content_from_parser(CamelMimePart *dw, CamelMimeParser camel_mime_parser_unstep(mp); bodypart = (CamelDataWrapper *)camel_mime_body_part_new(); camel_mime_part_construct_from_parser((CamelMimePart *)bodypart, mp); - camel_multipart_add_part((CamelMultipart *)dw, (CamelMimeBodyPart *)bodypart); + camel_multipart_add_part((CamelMultipart *)content, (CamelMimeBodyPart *)bodypart); } + + d(printf("Created multi-part\n")); break; } default: g_warning("Invalid state encountered???: %d", camel_mime_parser_state(mp)); -- cgit v1.2.3