[evolution/gnome-2-28] Bug #552552 - File/Empty Trash does not expunge maildir folders

[Milan Crha <mcrha src gnome org>]

commit 05c9766204d9f6fc3884977b1cabeae2bc53b3df
Author: Milan Crha <mcrha redhat com>
Date:   Fri Oct 9 11:58:33 2009 +0200

    Bug #552552 - File/Empty Trash does not expunge maildir folders

 mail/em-utils.c   |    4 +---
 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 5544a7d..ef0679b 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 d83aace..159fa0c 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;