diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/component-factory.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 6178c131f2..7362802401 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,10 @@ 2001-07-20 Peter Williams <peterw@ximian.com> + * component-factory.c (storage_remove_folder): Don't let the user + remove vtrash folders. + +2001-07-20 Peter Williams <peterw@ximian.com> + * mail-mt.c (mail_msgport_replied): Fix DanW's fix. Pass the right arguments to mail_msg_destroy. diff --git a/mail/component-factory.c b/mail/component-factory.c index 039cacd7df..272f5d571a 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -781,6 +781,9 @@ storage_remove_folder (EvolutionStorage *storage, g_warning ("storage_remove_folder: path=\"%s\"; uri=\"%s\"", path, physical_uri); if (*physical_uri) { + if (strncmp (physical_uri, "vtrash:", 7) == 0) + return EVOLUTION_STORAGE_ERROR_INVALID_URI; + url = camel_url_new (physical_uri, NULL); if (!url) return EVOLUTION_STORAGE_ERROR_INVALID_URI; |