diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-ops.c | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index d9b65aefb5..87343914e4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-01-16 Dan Winship <danw@ximian.com> + + * mail-ops.c (send_mail_send, do_send_queue): Update the X-Mailer + header to use the string specified by configure. + 2001-01-16 Jason Leach <jasonleach@usa.net> * subscribe-dialog.c: removed unecessary #inlcude "e-title-bar.h" diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 47a7933e70..aed29afd45 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -556,7 +556,7 @@ static void send_mail_send(struct _mail_msg *mm) CamelTransport *xport; FilterContext *context; - camel_medium_add_header(CAMEL_MEDIUM (m->message), "X-Mailer", "Evolution " VERSION " (Developer Preview)"); + camel_medium_add_header(CAMEL_MEDIUM (m->message), "X-Mailer", "Evolution (" XMAILER_VERSION " - Preview Release)"); camel_mime_message_set_date(m->message, CAMEL_MESSAGE_DATE_CURRENT, 0); xport = camel_session_get_transport(session, m->uri, &mm->ex); @@ -682,7 +682,6 @@ do_send_queue (gpointer in_data, gpointer op_data, CamelException *ex) extern CamelFolder *sent_folder; CamelTransport *xport; GPtrArray *uids; - char *x_mailer; guint32 set; int i; @@ -690,9 +689,6 @@ do_send_queue (gpointer in_data, gpointer op_data, CamelException *ex) if (!uids) return; - x_mailer = g_strdup_printf ("Evolution %s (Developer Preview)", - VERSION); - for (i = 0; i < uids->len; i++) { CamelMimeMessage *message; char *transport_url = NULL; @@ -701,7 +697,7 @@ do_send_queue (gpointer in_data, gpointer op_data, CamelException *ex) if (camel_exception_is_set (ex)) break; - camel_medium_add_header (CAMEL_MEDIUM (message), "X-Mailer", x_mailer); + camel_medium_add_header (CAMEL_MEDIUM (message), "X-Mailer", "Evolution (" XMAILER_VERSION " - Preview Release)"); camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0); @@ -739,8 +735,6 @@ do_send_queue (gpointer in_data, gpointer op_data, CamelException *ex) } } - g_free (x_mailer); - for (i = 0; i < uids->len; i++) g_free (uids->pdata[i]); g_ptr_array_free (uids, TRUE); |