aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers/local/camel-mbox-store.c
diff options
context:
space:
mode:
Diffstat (limited to 'camel/providers/local/camel-mbox-store.c')
-rw-r--r--camel/providers/local/camel-mbox-store.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index 359036f09b..ffce19171f 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -199,6 +199,8 @@ static void
delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
{
CamelFolderInfo *fi;
+ CamelException lex;
+ CamelFolder *lf;
char *name, *path;
struct stat st;
@@ -275,6 +277,30 @@ delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
}
g_free (path);
+
+ camel_exception_init (&lex);
+ if ((lf = camel_store_get_folder (store, folder_name, 0, &lex))) {
+ camel_object_get (lf, NULL, CAMEL_OBJECT_STATE_FILE, &path, NULL);
+ camel_object_set (lf, NULL, CAMEL_OBJECT_STATE_FILE, NULL, NULL);
+ camel_object_unref (lf);
+ } else {
+ camel_exception_clear (&lex);
+ }
+
+ if (path == NULL)
+ path = mbox_folder_name_to_meta_path (store, folder_name, ".cmeta");
+
+ if (unlink (path) == -1 && errno != ENOENT) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ _("Could not delete folder meta file `%s': %s"),
+ path, g_strerror (errno));
+
+ g_free (path);
+ g_free (name);
+ return;
+ }
+
+ g_free (path);
g_free (name);
fi = g_new0 (CamelFolderInfo, 1);