diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-10-09 17:58:33 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2009-10-09 17:58:33 +0800 |
| commit | 05c9766204d9f6fc3884977b1cabeae2bc53b3df (patch) | |
| tree | 68159722259fa647a564aef596e1c4275877dae4 | |
| parent | 877798de2e30304dec301d76dde4a09ee6585a27 (diff) | |
| download | gsoc2013-evolution-05c9766204d9f6fc3884977b1cabeae2bc53b3df.tar gsoc2013-evolution-05c9766204d9f6fc3884977b1cabeae2bc53b3df.tar.gz gsoc2013-evolution-05c9766204d9f6fc3884977b1cabeae2bc53b3df.tar.bz2 gsoc2013-evolution-05c9766204d9f6fc3884977b1cabeae2bc53b3df.tar.lz gsoc2013-evolution-05c9766204d9f6fc3884977b1cabeae2bc53b3df.tar.xz gsoc2013-evolution-05c9766204d9f6fc3884977b1cabeae2bc53b3df.tar.zst gsoc2013-evolution-05c9766204d9f6fc3884977b1cabeae2bc53b3df.zip | |
Bug #552552 - File/Empty Trash does not expunge maildir folders
| -rw-r--r-- | mail/em-utils.c | 4 | ||||
| -rw-r--r-- | mail/mail-tools.c | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c index 5544a7d403..ef0679ba50 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1739,7 +1739,6 @@ em_utils_empty_trash (GtkWidget *parent) camel_exception_init (&ex); - /* expunge all remote stores */ accounts = mail_config_get_accounts (); iter = e_list_get_iterator ((EList *) accounts); while (e_iterator_is_valid (iter)) { @@ -1750,8 +1749,7 @@ em_utils_empty_trash (GtkWidget *parent) provider = camel_provider_get(account->source->url, &ex); if (provider) { /* make sure this store is a remote store */ - if (provider->flags & CAMEL_PROVIDER_IS_STORAGE && - provider->flags & CAMEL_PROVIDER_IS_REMOTE) { + if (provider->flags & CAMEL_PROVIDER_IS_STORAGE) { mail_empty_trash (account, NULL, NULL); } } diff --git a/mail/mail-tools.c b/mail/mail-tools.c index d83aace1ea..159fa0ca97 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -77,6 +77,20 @@ mail_tool_get_inbox (const gchar *url, CamelException *ex) return folder; } +static gboolean +is_local_provider (CamelStore *store) +{ + CamelProvider *provider; + + g_return_val_if_fail (store != NULL, FALSE); + + provider = camel_service_get_provider (CAMEL_SERVICE (store)); + + g_return_val_if_fail (provider != NULL, FALSE); + + return (provider->flags & CAMEL_PROVIDER_IS_LOCAL) != 0; +} + CamelFolder * mail_tool_get_trash (const gchar *url, gint connect, CamelException *ex) { @@ -91,7 +105,7 @@ mail_tool_get_trash (const gchar *url, gint connect, CamelException *ex) if (!store) return NULL; - if (connect || ((CamelService *) store)->status == CAMEL_SERVICE_CONNECTED) + if (connect || ((CamelService *) store)->status == CAMEL_SERVICE_CONNECTED || is_local_provider (store)) trash = camel_store_get_trash (store, ex); else trash = NULL; |