remove gconf stuff. (em_format_html_set_xmailer_mask): new method to set

2003-09-30  Not Zed  <NotZed@Ximian.com>

        * em-format-html.c (efh_init): remove gconf stuff.
        (em_format_html_set_xmailer_mask): new method to set the xmailer mask.

        * em-folder-view.c (emfv_display_keys[]): Added charset key to
        monitor/retrieve, and xmailer_mask.
        (emfv_setting_notify): Monitor charset setting, pass onto the
        formatter, as well as xmailer_mask.

        * mail-preferences.c (mail_preferences_construct): use the new
        charset key.
        (mail_preferences_apply): use the new charset key.

        * evolution-mail.schemas: Moved the mail/format/charset to
        mail/display/charset.  1. it makes more sense, and 2. it makes
        notification update easier in em-folder-view.c

        * em-format.c (emf_init): remove the gconf charset stuff, for bug
        #48791, and also actually fixes the fixme that jeff thought he
        fixed.
        (em_format_format_text): use default charset as fallback.
        (em_format_set_default_charset): New method to set the default charset.
        (gconf_charset_changed): removed.

svn path=/trunk/; revision=22768

1 files changed, 1 insertions, 0 deletions

diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index c9b4705a96..31675f62fd 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -130,6 +130,7 @@ void em_format_html_load_http(EMFormatHTML *emf);
 
 void em_format_html_set_load_http(EMFormatHTML *emf, int state);
 void em_format_html_set_mark_citations(EMFormatHTML *emf, int state, guint32 citation_colour);
+void em_format_html_set_xmailer_mask(EMFormatHTML *emf, unsigned int xmailer_mask);
 
 /* output headers */
 void em_format_html_format_headers(EMFormatHTML *efh, struct _CamelStream *stream, struct _CamelMedium *part);