diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-12-05 02:32:25 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-12-05 02:33:29 +0800 |
| commit | ae6344a22b041577fdab9bf3866dbfe779dc1409 (patch) | |
| tree | a2c0a2fe4d684cd8609f83c4619a50997a7421a6 /modules/mail/e-mail-shell-backend.c | |
| parent | 56975aec6a4904140df94361ff9c4bbca5b1dc95 (diff) | |
| download | gsoc2013-evolution-ae6344a22b041577fdab9bf3866dbfe779dc1409.tar gsoc2013-evolution-ae6344a22b041577fdab9bf3866dbfe779dc1409.tar.gz gsoc2013-evolution-ae6344a22b041577fdab9bf3866dbfe779dc1409.tar.bz2 gsoc2013-evolution-ae6344a22b041577fdab9bf3866dbfe779dc1409.tar.lz gsoc2013-evolution-ae6344a22b041577fdab9bf3866dbfe779dc1409.tar.xz gsoc2013-evolution-ae6344a22b041577fdab9bf3866dbfe779dc1409.tar.zst gsoc2013-evolution-ae6344a22b041577fdab9bf3866dbfe779dc1409.zip | |
Bug #315317 - Add option to expunge messages on folder leave
Diffstat (limited to 'modules/mail/e-mail-shell-backend.c')
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 7db1b13b86..c05e8518fe 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -663,7 +663,7 @@ mail_shell_backend_delete_junk_policy_decision (EMailBackend *backend) empty_date = g_settings_get_int (settings, "junk-empty-date"); } - delete_junk &= (empty_days == 0) || (empty_date + empty_days <= now); + delete_junk = delete_junk && ((empty_days == 0) || (empty_days > 0 && empty_date + empty_days <= now)); if (delete_junk) { g_settings_set_int (settings, "junk-empty-date", now); @@ -704,7 +704,7 @@ mail_shell_backend_empty_trash_policy_decision (EMailBackend *backend) empty_date = g_settings_get_int (settings, "trash-empty-date"); } - empty_trash &= (empty_days == 0) || (empty_date + empty_days <= now); + empty_trash = empty_trash && ((empty_days == 0) || (empty_days > 0 && empty_date + empty_days <= now)); if (empty_trash) { g_settings_set_int (settings, "trash-empty-date", now); |