diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-03 01:49:11 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-03 02:02:55 +0800 |
commit | a1082f0e45e1e34c3f0193ff3a51588c89f914c1 (patch) | |
tree | 9666a5cd090740aba0729c5ad55b808b1bf083e3 /modules/mail/e-mail-shell-settings.c | |
parent | b554b165941e9b4e394554591e93e31e5accef16 (diff) | |
download | gsoc2013-evolution-a1082f0e45e1e34c3f0193ff3a51588c89f914c1.tar.gz gsoc2013-evolution-a1082f0e45e1e34c3f0193ff3a51588c89f914c1.tar.zst gsoc2013-evolution-a1082f0e45e1e34c3f0193ff3a51588c89f914c1.zip |
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.
Diffstat (limited to 'modules/mail/e-mail-shell-settings.c')
-rw-r--r-- | modules/mail/e-mail-shell-settings.c | 16 |
1 files changed, 14 insertions, 2 deletions
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 ( @@ -400,6 +400,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", NULL, |