diff options
| -rw-r--r-- | composer/ChangeLog | 9 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment-bar.c | 6 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 9 |
3 files changed, 15 insertions, 9 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 9e90314668..7f5c75b617 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,12 @@ +2000-04-26 NotZed <NotZed@HelixCode.com> + + * e-msg-composer.c (build_message): Use camel_mime_part_set_text() + to set the text rather than messing with data wrappers. + + * e-msg-composer-attachment-bar.c (attach_to_multipart): Change + for new camel-stream interfaces. + (attach_to_multipart): Also set base64 encoding by default. + 2000-04-25 Radek Doulik <rodo@helixcode.com> * e-msg-composer.c (create_editor): use uih here diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c index 59785587fd..c37c9558a0 100644 --- a/composer/e-msg-composer-attachment-bar.c +++ b/composer/e-msg-composer-attachment-bar.c @@ -622,13 +622,13 @@ attach_to_multipart (CamelMultipart *multipart, content = CAMEL_DATA_WRAPPER (gtk_object_new (CAMEL_SIMPLE_DATA_WRAPPER_TYPE, NULL)); camel_data_wrapper_set_mime_type (content, attachment->mime_type); - stream = camel_stream_fs_new_with_name (attachment->file_name, - CAMEL_STREAM_FS_READ); + stream = camel_stream_fs_new_with_name (attachment->file_name, O_RDONLY, 0); camel_data_wrapper_construct_from_stream (content, stream); camel_stream_close (stream); camel_medium_set_content_object (CAMEL_MEDIUM (part), content); - /* FIXME: What about Content-Transfer-Encoding? */ + /* TODO: could possibly select an appropriate encoder based on the content */ + camel_mime_part_set_encoding((CamelMimePart *)part, CAMEL_MIME_PART_ENCODING_BASE64); camel_multipart_add_part (multipart, part); } diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 0271666454..17b34fb943 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -155,13 +155,10 @@ build_message (EMsgComposer *composer) body_part = camel_mime_body_part_new (); text = get_editor_text (BONOBO_WIDGET (composer->editor)); - sdr = camel_simple_data_wrapper_new (); - camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (sdr), + /* set text sets text/plain */ + camel_mime_part_set_text((CamelMimePart *)body_part, text); + camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (camel_medium_get_content_object((CamelMedium *)body_part)), "text/html"); - camel_simple_data_wrapper_set_text (sdr, text); - camel_medium_set_content_object (CAMEL_MEDIUM (body_part), - CAMEL_DATA_WRAPPER (sdr)); - gtk_object_unref (GTK_OBJECT (sdr)); g_free (text); camel_multipart_add_part (multipart, body_part); |