From a1082f0e45e1e34c3f0193ff3a51588c89f914c1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 13:49:11 -0400 Subject: Kill the last GtkOptionMenu instances. Wrote a new widget (ECharsetComboBox) to replace e-charset-picker.c. The widget provides a "charset" string property that allows us to bind to GConf keys (via EShellSettings). Moved e_charset_add_radio_actions() to e-util/e-charset.c. Updated Glade files, #include lines, etc. --- modules/mail/e-mail-shell-settings.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'modules/mail/e-mail-shell-settings.c') diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c index c7e3218191..897ccfc18b 100644 --- a/modules/mail/e-mail-shell-settings.c +++ b/modules/mail/e-mail-shell-settings.c @@ -95,14 +95,14 @@ e_mail_shell_settings_init (EShell *shell) e_shell_settings_install_property ( g_param_spec_string ( - "mail-charset-default", + "mail-charset", NULL, NULL, NULL, G_PARAM_READWRITE)); e_shell_settings_bind_to_gconf ( - shell_settings, "mail-charset-default", + shell_settings, "mail-charset", "/apps/evolution/mail/display/charset"); e_shell_settings_install_property ( @@ -399,6 +399,18 @@ e_mail_shell_settings_init (EShell *shell) /*** Composer Preferences ***/ + e_shell_settings_install_property ( + g_param_spec_string ( + "composer-charset", + NULL, + NULL, + NULL, + G_PARAM_READWRITE)); + + e_shell_settings_bind_to_gconf ( + shell_settings, "composer-charset", + "/apps/evolution/mail/composer/charset"); + e_shell_settings_install_property ( g_param_spec_boolean ( "composer-format-html", -- cgit