aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/Makefile.am1
-rw-r--r--mail/mail-ops.c16
3 files changed, 26 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5552d4ad47..859efa5836 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2000-07-15 Ettore Perazzoli <ettore@helixcode.com>
+
+ * mail-ops.c (set_x_mailer_header): New helper function to set the
+ `X-Mailer:' header to to `Evolution <version> [Developer
+ Preview]".
+ (real_send_mail): Call it.
+
+2000-07-14 Ettore Perazzoli <ettore@helixcode.com>
+
+ * Makefile.am (evolution_mail_LDADD): Add `GCONF_LIBS'.
+
2000-07-14 Dan Winship <danw@helixcode.com>
* mail-format.c (write_headers): put a <p> at the end of the
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 3d16c59b69..05f3260c2f 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -72,6 +72,7 @@ evolution_mail_LDADD = \
$(top_builddir)/filter/libfilter.la \
$(BONOBO_VFS_GNOME_LIBS) \
$(GTKHTML_LIBS) \
+ $(GCONF_LIBS) \
$(THREADS_LIBS) \
$(UNICODE_LIBS)
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index ece3fe493d..94cd42fae0 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -397,6 +397,18 @@ ask_confirm_for_empty_subject (EMsgComposer *composer)
}
static void
+set_x_mailer_header (CamelMedium *medium)
+{
+ char *mailer_string;
+
+ mailer_string = g_strdup_printf ("Evolution %s (Developer Preview)", VERSION);
+
+ camel_medium_add_header (medium, "X-Mailer", mailer_string);
+
+ g_free (mailer_string);
+}
+
+static void
real_send_mail (gpointer user_data)
{
rsm_t *info = (rsm_t *) user_data;
@@ -421,9 +433,9 @@ real_send_mail (gpointer user_data)
from = info->from;
psd = info->psd;
+ set_x_mailer_header (CAMEL_MEDIUM (message));
+
camel_mime_message_set_from (message, from);
- camel_medium_add_header (CAMEL_MEDIUM (message), "X-Mailer",
- "Evolution (Developer Preview)");
camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
camel_service_connect (CAMEL_SERVICE (transport), ex);