From 956b17ed95a946949c51bfb6be9b4e358e764a45 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 4 Feb 2004 05:57:21 +0000 Subject: changed order around, first try to delete and only remove from the object 2004-02-04 Not Zed * camel-store.c (camel_store_delete_folder): changed order around, first try to delete and only remove from the object bag if the delete worked. If vjunk/vtrash enabled, don't allow those to be deleted. (cs_delete_cached_folder): helper to delete the folder if its in the cache, remove it from trash/junk, etc. (camel_store_unsubscribe_folder): changed similarly to delete_folder. * camel-vee-store.c (vee_delete_folder): dont do any trash/junk processing anymore. 2004-02-03 Not Zed * camel-store.c: use the folders object bag to manage the trash folder and junk folders. Remove the init_trash and init_junk stuff, just use get_trash and get_junk to mean the same thing. Get rid of the hacked up vjunk and vtrash "uri" stuff too. * camel-object.c (camel_object_bag_add): null out the pair->func, otherwise we get an uninitalised memory read during unhook event. svn path=/trunk/; revision=24603 --- camel/camel-digest-store.c | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'camel/camel-digest-store.c') diff --git a/camel/camel-digest-store.c b/camel/camel-digest-store.c index 833593ac9f..c5fe7071b1 100644 --- a/camel/camel-digest-store.c +++ b/camel/camel-digest-store.c @@ -38,9 +38,7 @@ static CamelFolder *digest_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex); static void digest_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex); static void digest_rename_folder (CamelStore *store, const char *old, const char *new, CamelException *ex); -static void digest_init_trash (CamelStore *store); static CamelFolder *digest_get_trash (CamelStore *store, CamelException *ex); -static void digest_init_junk (CamelStore *store); static CamelFolder *digest_get_junk (CamelStore *store, CamelException *ex); static CamelFolderInfo *digest_get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex); @@ -92,9 +90,7 @@ camel_digest_store_class_init (CamelDigestStoreClass *klass) store_class->get_folder_info = digest_get_folder_info; store_class->free_folder_info = camel_store_free_folder_info_full; - store_class->init_trash = digest_init_trash; store_class->get_trash = digest_get_trash; - store_class->init_junk = digest_init_junk; store_class->get_junk = digest_get_junk; } @@ -158,26 +154,12 @@ digest_get_folder (CamelStore *store, const char *folder_name, guint32 flags, Ca return NULL; } -static void -digest_init_trash (CamelStore *store) -{ - /* no-op */ - ; -} - static CamelFolder * digest_get_trash (CamelStore *store, CamelException *ex) { return NULL; } -static void -digest_init_junk (CamelStore *store) -{ - /* no-op */ - ; -} - static CamelFolder * digest_get_junk (CamelStore *store, CamelException *ex) { -- cgit v1.2.3