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/em-format-html.c | |
| 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/em-format-html.c')
| -rw-r--r-- | mail/em-format-html.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c index a8cf6c85c3..32f763311d 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -40,8 +40,6 @@ #include <gtkhtml/gtkhtml-stream.h> #include <gtkhtml/htmlengine.h> -#include <gconf/gconf-client.h> - #include <libgnomevfs/gnome-vfs-utils.h> #include <libgnomevfs/gnome-vfs-mime-utils.h> #include <libgnomevfs/gnome-vfs-mime-handlers.h> @@ -111,7 +109,6 @@ static void efh_init(GObject *o) { EMFormatHTML *efh = (EMFormatHTML *)o; - GConfClient *gconf; efh->priv = g_malloc0(sizeof(*efh->priv)); @@ -137,11 +134,6 @@ efh_init(GObject *o) efh->text_colour = 0; efh->text_html_flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES | CAMEL_MIME_FILTER_TOHTML_MARK_CITATION; - - /* TODO: should this be here? wont track changes ... */ - gconf = gconf_client_get_default(); - efh->xmailer_mask = gconf_client_get_int(gconf, "/apps/evolution/mail/display/xmailer_mask", NULL); - g_object_unref(gconf); } static void @@ -279,6 +271,15 @@ em_format_html_set_mark_citations(EMFormatHTML *emfh, int state, guint32 citatio } } +void +em_format_html_set_xmailer_mask(EMFormatHTML *emfh, unsigned int xmailer_mask) +{ + if (emfh->xmailer_mask ^ xmailer_mask) { + emfh->xmailer_mask = xmailer_mask; + em_format_format_clone((EMFormat *)emfh, emfh->format.message, (EMFormat *)emfh); + } +} + CamelMimePart * em_format_html_file_part(EMFormatHTML *efh, const char *mime_type, const char *path, const char *name) { |