diff options
author | Not Zed <NotZed@Ximian.com> | 2001-04-05 10:06:26 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2001-04-05 10:06:26 +0800 |
commit | 130017e15709e1f16cac8271214d0f7f41845a2f (patch) | |
tree | 85723c00f1d45c5352f2c4e97e445c85f4a1c761 /mail/mail-ops.c | |
parent | f66390af642e3a02bbfb2974955eeae14770e406 (diff) | |
download | gsoc2013-evolution-130017e15709e1f16cac8271214d0f7f41845a2f.tar.gz gsoc2013-evolution-130017e15709e1f16cac8271214d0f7f41845a2f.tar.zst gsoc2013-evolution-130017e15709e1f16cac8271214d0f7f41845a2f.zip |
Merge from evolution-0-10 to evolution-0-10-merge-0 into head.
2001-04-05 Not Zed <NotZed@Ximian.com>
* Merge from evolution-0-10 to evolution-0-10-merge-0 into head.
svn path=/trunk/; revision=9193
Diffstat (limited to 'mail/mail-ops.c')
-rw-r--r-- | mail/mail-ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 57397af8e7..e4b5e111d4 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -516,14 +516,14 @@ mail_send_message(CamelMimeMessage *message, const char *destination, CamelFilte if (!transport_url) { header = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Transport"); if (header) { - transport_url = g_strdup (header); + transport_url = g_strstrip(g_strdup (header)); camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Transport"); } } if (!sent_folder_uri) { header = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc"); if (header) { - sent_folder_uri = g_strdup (header); + sent_folder_uri = g_strstrip(g_strdup (header)); camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc"); } } @@ -693,7 +693,7 @@ send_queue_send(struct _mail_msg *mm) uids = camel_folder_get_uids (m->queue); if (uids == NULL || uids->len == 0) return; - + if (m->cancel) camel_operation_register (m->cancel); |