diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/component-factory.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index b66d0c6edf..a1f461d9c9 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,10 @@ 2003-01-27 Jeffrey Stedfast <fejj@ximian.com> + * component-factory.c (storage_remove_folder): Change + strcmp(fi->path, path) to strcmp(fi->name, name) and now the + execution takes the right path. My patch base on Callie's patch + for bug #33525. + * mail-identify.c (mail_identify_mime_part): Fixed a #warning by converting a local path into a file: uri before feeding it to gnome-vfs. diff --git a/mail/component-factory.c b/mail/component-factory.c index ef655c3d90..1716b2393d 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -1266,21 +1266,24 @@ storage_remove_folder (EvolutionStorage *storage, root = camel_store_get_folder_info (store, name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE, &ex); - camel_url_free (url); + if (!root || camel_exception_is_set (&ex)) { notify_listener_exception (listener, &ex); camel_exception_clear (&ex); + camel_url_free (url); return; } /* walk the tree until we find the particular child folder we want to delete */ fi = root; while (fi) { - if (!strcmp (fi->path, path)) + if (!strcmp (fi->full_name, name)) break; fi = fi->child; } + camel_url_free (url); + if (!fi) { notify_listener (listener, GNOME_Evolution_Storage_INVALID_URI); camel_store_free_folder_info (store, root); |