diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-02 00:16:23 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-02 02:39:23 +0800 |
commit | b554b165941e9b4e394554591e93e31e5accef16 (patch) | |
tree | 4232dc565d325a6f5b3c67081fb484c99055d092 /modules/mail/e-mail-shell-settings.c | |
parent | 1351c8e4fb443a9705bb1225c3c574c05a36f8ca (diff) | |
download | gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.tar.gz gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.tar.zst gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.zip |
Fix merge issues in EMAccountEditor.
Diffstat (limited to 'modules/mail/e-mail-shell-settings.c')
-rw-r--r-- | modules/mail/e-mail-shell-settings.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c index 8237924e3c..c7e3218191 100644 --- a/modules/mail/e-mail-shell-settings.c +++ b/modules/mail/e-mail-shell-settings.c @@ -155,6 +155,18 @@ e_mail_shell_settings_init (EShell *shell) e_shell_settings_install_property ( g_param_spec_boolean ( + "mail-empty-junk-on-exit", + NULL, + NULL, + FALSE, + G_PARAM_READWRITE)); + + e_shell_settings_bind_to_gconf ( + shell_settings, "mail-empty-junk-on-exit", + "/apps/evolution/mail/junk/empty_on_exit"); + + e_shell_settings_install_property ( + g_param_spec_boolean ( "mail-empty-trash-on-exit", NULL, NULL, |