diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-14 20:08:57 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-14 20:08:57 +0800 |
| commit | 7ab5ae3fc72516cceeb09a48bc5a39f7b57933de (patch) | |
| tree | f1d1afbfa9d8c97dc691a2d241c9ec368fdf67d3 /mail/mail-ops.c | |
| parent | cda52538315c481bc3b11ff2db40f7165113d1ab (diff) | |
| parent | c4308051159a37f16521b881f59259861998f4ae (diff) | |
| download | gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.gz gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.bz2 gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.lz gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.xz gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.zst gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'mail/mail-ops.c')
| -rw-r--r-- | mail/mail-ops.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 8bdb329f36..24a494ddac 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1410,7 +1410,26 @@ expunge_pop3_stores (CamelFolder *expunging, account->source && account->source->url && g_str_has_prefix (account->source->url, "pop://")) { CamelFolder *folder; - gboolean any_found = FALSE; + CamelService *service; + CamelSettings *settings; + gboolean any_found = FALSE, delete_expunged = FALSE, keep_on_server = FALSE; + + service = camel_session_get_service (CAMEL_SESSION (session), account->uid); + if (!CAMEL_IS_STORE (service)) + continue; + + settings = camel_service_get_settings (service); + if (!settings) + continue; + + g_object_get ( + settings, + "delete-expunged", &delete_expunged, + "keep-on-server", &keep_on_server, + NULL); + + if (!keep_on_server || !delete_expunged) + continue; folder = e_mail_session_get_inbox_sync ( session, account->uid, cancellable, error); |