From 0d9c13bb3755dcbe5165d014dacd734ddd3bbe8c Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 17 Sep 2001 23:26:36 +0000 Subject: Unsubscribe from the folder before deleting it. 2001-09-17 Jeffrey Stedfast * component-factory.c (storage_remove_folder): Unsubscribe from the folder before deleting it. * mail-ops.c (remove_folder_get): If the store supports subscriptions, make sure to unsubscribe from the folder before deleting it. svn path=/trunk/; revision=12921 --- mail/component-factory.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'mail/component-factory.c') diff --git a/mail/component-factory.c b/mail/component-factory.c index 6a238ea2aa..0482b8ed0a 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -940,17 +940,18 @@ storage_remove_folder (EvolutionStorage *storage, camel_url_free (url); if (camel_exception_is_set (&ex)) goto exception; - + camel_store_delete_folder (store, fi->full_name, &ex); -#endif - camel_store_delete_folder (store, path+1, &ex); - if (camel_exception_is_set (&ex)) - goto exception; +#endif if (camel_store_supports_subscriptions (store)) /*camel_store_unsubscribe_folder (store, fi->full_name, NULL);*/ camel_store_unsubscribe_folder (store, path+1, NULL); + camel_store_delete_folder (store, path+1, &ex); + if (camel_exception_is_set (&ex)) + goto exception; + evolution_storage_removed_folder (storage, path); /*camel_store_free_folder_info (store, fi);*/ -- cgit v1.2.3