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-store.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'camel/camel-store.h') diff --git a/camel/camel-store.h b/camel/camel-store.h index 30f69d1e67..cee24887b6 100644 --- a/camel/camel-store.h +++ b/camel/camel-store.h @@ -92,9 +92,6 @@ struct _CamelStore CamelService parent_object; struct _CamelStorePrivate *priv; - CamelFolder *vtrash; - CamelFolder *vjunk; - CamelObjectBag *folders; int flags; @@ -125,15 +122,10 @@ typedef struct { const char *folder_name, guint32 flags, CamelException *ex); - CamelFolder * (*get_inbox) (CamelStore *store, - CamelException *ex); - - void (*init_trash) (CamelStore *store); - CamelFolder * (*get_trash) (CamelStore *store, - CamelException *ex); - void (*init_junk) (CamelStore *store); - CamelFolder * (*get_junk) (CamelStore *store, - CamelException *ex); + + CamelFolder * (*get_inbox) (CamelStore *store, CamelException *ex); + CamelFolder * (*get_trash) (CamelStore *store, CamelException *ex); + CamelFolder * (*get_junk) (CamelStore *store, CamelException *ex); CamelFolderInfo *(*create_folder) (CamelStore *store, const char *parent_name, -- cgit v1.2.3