diff options
| -rw-r--r-- | mail/ChangeLog | 3 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 14 |
2 files changed, 3 insertions, 14 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 3118d588dd..c2e05ead63 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,8 +1,5 @@ 2001-04-22 Jeffrey Stedfast <fejj@ximian.com> - * mail-callbacks.c (composer_get_message): Only set the - X-Evolution-* header if that value is non-NULL. - * mail-ops.c (mail_send_message): Lets do proper refcounting on the sent-folder. Also, g_strdup() the sent_folder_uri since we later free it. If we don't, then we get lovely corrupt memory. diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index b59e4efcb2..871a63325e 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -330,17 +330,9 @@ composer_get_message (EMsgComposer *composer) /* Add info about the sending account */ account = e_msg_composer_get_preferred_account (composer); if (account) { - if (account->name) - camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Account", - account->name); - - if (account->transport && account->transport->url) - camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Transport", - account->transport->url); - - if (account->sent_folder_uri) - camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc", - account->sent_folder_uri); + camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Account", account->name); + camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Transport", account->transport->url); + camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc", account->sent_folder_uri); } return message; |