diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-ops.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index fcb5d5f223..0775114de0 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,10 @@ 2002-01-29 Jeffrey Stedfast <fejj@ximian.com> + * mail-ops.c (mail_send_message): Make X-Evolution-Account take + priority over X-Evolution-Transport. Should we just get rid of + X-Evolution-Transport? Anyways, this ought to fix a number of + complaints. + * mail-accounts.c (construct): Don't pass NULL text to gtk_entry_set_text. Maybe this will fix bug #18971. diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 4973c56dbc..73d369f31f 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -461,9 +461,7 @@ mail_send_message (CamelMimeMessage *message, const char *destination, xev = mail_tool_remove_xevolution_headers (message); - if (xev->transport) { - transport_url = g_strstrip (g_strdup (xev->transport)); - } else if (xev->account) { + if (xev->account) { const MailConfigAccount *account; char *name; @@ -473,6 +471,8 @@ mail_send_message (CamelMimeMessage *message, const char *destination, if (account && account->transport && account->transport->url) transport_url = g_strdup (account->transport->url); + } else if (xev->transport) { + transport_url = g_strstrip (g_strdup (xev->transport)); } if (xev->fcc) |