diff options
-rw-r--r-- | mail/ChangeLog | 8 | ||||
-rw-r--r-- | mail/em-composer-utils.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4501501bce..d547852290 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2004-06-01 Jeffrey Stedfast <fejj@novell.com> + + * em-composer-utils.c (forward_non_attached): Don't attach + anything ever. This is confusing way too many users who expect it + to attach all or nothing. Since Forward-Attached is what users + should be using to forward a message and all attachments, make + these not attach anything (which is what other mailers do anyway). + 2004-06-01 Not Zed <NotZed@Ximian.com> * em-folder-selector.c (em_folder_selector_get_selected_uri): set diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 3e73e682bf..abc758915f 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -889,11 +889,7 @@ forward_non_attached (GPtrArray *messages, int style, const char *fromuri) if (text) { composer = create_new_composer (subject, fromuri); - - wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message)); - if (CAMEL_IS_MULTIPART (wrapper)) - e_msg_composer_add_message_attachments (composer, message, FALSE); - + e_msg_composer_set_body_text (composer, text); e_msg_composer_unset_changed (composer); |