Handle the X-Mailer display style. (There is currently no GUI for

	* mail-config.c (config_read, mail_config_write,
	mail_config_get_x_mailer_display_style,
	mail_config_set_x_mailer_display_style): Handle the X-Mailer
	display style. (There is currently no GUI for configuring this.)

	* mail-format.c (write_headers, write_xmailer_header): Show
	X-Mailer/User-Agent (and Rupert's stamp of approval) as
	appropriate.

svn path=/trunk/; revision=16430

1 files changed, 10 insertions, 0 deletions

diff --git a/mail/mail-config.h b/mail/mail-config.h
index 917924d025..4d34374d9a 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -114,6 +114,13 @@ typedef enum {
 	MAIL_CONFIG_NOTIFY_PLAY_SOUND,
 } MailConfigNewMailNotify;
 
+typedef enum {
+	MAIL_CONFIG_XMAILER_NONE            = 0,
+	MAIL_CONFIG_XMAILER_EVO             = 1,
+	MAIL_CONFIG_XMAILER_OTHER           = 2,
+	MAIL_CONFIG_XMAILER_RUPERT_APPROVED = 4
+} MailConfigXMailerDisplayStyle;
+
 typedef struct {
 	char *name;
 	guint32 color;
@@ -234,6 +241,9 @@ void                    mail_config_set_new_mail_notify (MailConfigNewMailNotify
 const char             *mail_config_get_new_mail_notify_sound_file (void);
 void                    mail_config_set_new_mail_notify_sound_file (const char *filename);
 
+MailConfigXMailerDisplayStyle mail_config_get_x_mailer_display_style (void);
+void                          mail_config_set_x_mailer_display_style (MailConfigXMailerDisplayStyle style);
+
 const char *mail_config_get_default_charset (void);
 void        mail_config_set_default_charset (const char *charset);