Only write a newline between the headers and the content object if the

* camel-mime-part.c (write_to_stream): Only write a newline
	between the headers and the content object if the content object
	is not a CamelMedium. (If the content is a medium, it may have its
	own headers, which then need to go before the blank line.)

svn path=/trunk/; revision=2647
This commit is contained in:
Dan Winship
2000-04-26 21:50:34 +00:00
parent d24747d1b5
commit 82071abd45
2 changed files with 12 additions and 4 deletions

View File

@ -1,5 +1,10 @@
2000-04-26 Dan Winship <danw@helixcode.com>
* camel-mime-part.c (write_to_stream): Only write a newline
between the headers and the content object if the content object
is not a CamelMedium. (If the content is a medium, it may have its
own headers, which then need to go before the blank line.)
* camel-mime-body-part.[ch]: Remove. We weren't using the fields
that made this different from camel-mime-part, so it basically
just forced us to do lots of gratuitous typecasting.

View File

@ -504,11 +504,14 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
}
}
if ( (count = camel_stream_write_string(stream,"\n")) == -1)
return -1;
total += count;
content = camel_medium_get_content_object (medium);
if (!CAMEL_IS_MEDIUM (content)) {
if ( (count = camel_stream_write_string(stream,"\n")) == -1)
return -1;
total += count;
}
if (content) {
if ( (count = camel_data_wrapper_write_to_stream(content, stream)) == -1 )
return -1;