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/mail-preferences.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/mail-preferences.c')
| -rw-r--r-- | mail/mail-preferences.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c index 19b786fb6d..43f3a438f7 100644 --- a/mail/mail-preferences.c +++ b/mail/mail-preferences.c @@ -239,7 +239,7 @@ mail_preferences_construct (MailPreferences *prefs) g_signal_connect (prefs->timeout, "value-changed", G_CALLBACK (settings_changed), prefs); prefs->charset = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuCharset")); - buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/format/charset", NULL); + buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/charset", NULL); menu = e_charset_picker_new (buf && *buf ? buf : e_iconv_locale_charset ()); gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu)); option_menu_connect (prefs->charset, prefs); @@ -398,7 +398,7 @@ mail_preferences_apply (MailPreferences *prefs) if (!(string = e_charset_picker_get_charset (menu))) string = g_strdup (e_iconv_locale_charset ()); - gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/format/charset", string, NULL); + gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/charset", string, NULL); g_free (string); gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/display/mark_citations", |