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, 2 insertions, 0 deletions

diff --git a/mail/em-format.h b/mail/em-format.h
index 14bdab1cdc..cc0f6bdd75 100644
--- a/mail/em-format.h
+++ b/mail/em-format.h
@@ -118,6 +118,7 @@ struct _EMFormat {
 
 	em_format_mode_t mode;	/* source/headers/etc */
 	char *charset;		/* charset override */
+	char *default_charset;	/* charset fallback */
 };
 
 struct _EMFormatClass {
@@ -150,6 +151,7 @@ void em_format_set_session(EMFormat *emf, struct _CamelSession *s);
 
 void em_format_set_mode(EMFormat *emf, em_format_mode_t type);
 void em_format_set_charset(EMFormat *emf, const char *charset);
+void em_format_set_default_charset(EMFormat *emf, const char *charset);
 
 void em_format_clear_headers(EMFormat *emf); /* also indicates to show all headers */
 void em_format_default_headers(EMFormat *emf);