diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 7bf2b76102..99858f0531 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-10-11 Jeffrey Stedfast <fejj@ximian.com> + + * mail-callbacks.c (do_forward_non_attached): Attach the message + attachments. Fixes bug #5439. + 2001-10-11 Dan Winship <danw@ximian.com> * mail-folder-cache.c (update_1folder): No longer need to pass diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 56b155e828..3adfe46dc7 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -1121,8 +1121,8 @@ forward_get_composer (CamelMimeMessage *message, const char *subject) static void do_forward_non_attached (CamelFolder *folder, char *uid, CamelMimeMessage *message, void *data) { - char *subject, *text; MailConfigForwardStyle style = GPOINTER_TO_INT (data); + char *subject, *text; if (!message) return; @@ -1133,7 +1133,14 @@ do_forward_non_attached (CamelFolder *folder, char *uid, CamelMimeMessage *messa if (text) { EMsgComposer *composer = forward_get_composer (message, subject); if (composer) { + CamelDataWrapper *wrapper; + e_msg_composer_set_body_text (composer, text); + + wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message)); + if (CAMEL_IS_MULTIPART (wrapper)) + e_msg_composer_add_message_attachments (composer, message); + gtk_widget_show (GTK_WIDGET (composer)); e_msg_composer_unset_changed (composer); } |