diff options
| author | Not Zed <NotZed@Ximian.com> | 2003-09-30 14:52:13 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2003-09-30 14:52:13 +0800 |
| commit | dbecfb231409fd9170147739862e8517a3d3979a (patch) | |
| tree | 41c5e85046e0427956f8b1645cc1cb1817a23c16 /mail/evolution-mail.schemas | |
| parent | 1af3fe8fe0e326a71c78e87caa68c4532765f9eb (diff) | |
| download | gsoc2013-evolution-dbecfb231409fd9170147739862e8517a3d3979a.tar gsoc2013-evolution-dbecfb231409fd9170147739862e8517a3d3979a.tar.gz gsoc2013-evolution-dbecfb231409fd9170147739862e8517a3d3979a.tar.bz2 gsoc2013-evolution-dbecfb231409fd9170147739862e8517a3d3979a.tar.lz gsoc2013-evolution-dbecfb231409fd9170147739862e8517a3d3979a.tar.xz gsoc2013-evolution-dbecfb231409fd9170147739862e8517a3d3979a.tar.zst gsoc2013-evolution-dbecfb231409fd9170147739862e8517a3d3979a.zip | |
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
Diffstat (limited to 'mail/evolution-mail.schemas')
| -rw-r--r-- | mail/evolution-mail.schemas | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mail/evolution-mail.schemas b/mail/evolution-mail.schemas index a5a761d8b3..013af3f96a 100644 --- a/mail/evolution-mail.schemas +++ b/mail/evolution-mail.schemas @@ -188,6 +188,20 @@ </schema> <schema> + <key>/schemas/apps/evolution/mail/display/charset</key> + <applyto>/apps/evolution/mail/display/charset</applyto> + <owner>evolution-mail</owner> + <type>string</type> + <default></default> + <locale name="C"> + <short>Default charset in which to display messages</short> + <long> + Default charset in which to display messages. + </long> + </locale> + </schema> + + <schema> <key>/schemas/apps/evolution/mail/display/load_http_images</key> <applyto>/apps/evolution/mail/display/load_http_images</applyto> <owner>evolution-mail</owner> @@ -423,20 +437,6 @@ <!-- Format settings --> <schema> - <key>/schemas/apps/evolution/mail/format/charset</key> - <applyto>/apps/evolution/mail/format/charset</applyto> - <owner>evolution-mail</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Default charset in which to display messages</short> - <long> - Default charset in which to display messages. - </long> - </locale> - </schema> - - <schema> <key>/schemas/apps/evolution/mail/format/forward_style</key> <applyto>/apps/evolution/mail/format/forward_style</applyto> <owner>evolution-mail</owner> |