ugh, don't bother checking if the header values are non-NULL - it doesn't hurt to set a NULL header.

svn path=/trunk/; revision=9500
This commit is contained in:
Jeffrey Stedfast
2001-04-23 02:20:48 +00:00
parent dfc8e2ad3f
commit 2439e91a5c
2 changed files with 3 additions and 14 deletions

View File

@ -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.

View File

@ -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;