From 067979285b49a2cd3f0b878a3a6f8bf52fdbf2b6 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 19 Mar 2004 05:44:26 +0000 Subject: ref the diary before replaying it. it could get unreffed during replay if 2004-03-19 Not Zed * camel-disco-store.c (disco_connect): ref the diary before replaying it. it could get unreffed during replay if there's an error and we disconnect. * camel-store.c (camel_store_get_folder): no longer use folder_lock, we already have adequate serialisation code here or below here. I hope. (camel_store_get_folder_info): same here. svn path=/trunk/; revision=25126 --- camel/camel-store.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'camel/camel-store.c') diff --git a/camel/camel-store.c b/camel/camel-store.c index 38bfcc1e32..f4b96a1959 100644 --- a/camel/camel-store.c +++ b/camel/camel-store.c @@ -234,8 +234,6 @@ camel_store_get_folder (CamelStore *store, const char *folder_name, guint32 flag if (!(flags & CAMEL_STORE_FOLDER_CREATE)) flags &= ~CAMEL_STORE_FOLDER_EXCL; - CAMEL_STORE_LOCK(store, folder_lock); - if (store->folders) { /* Try cache first. */ folder = camel_object_bag_reserve(store->folders, folder_name); @@ -281,8 +279,6 @@ camel_store_get_folder (CamelStore *store, const char *folder_name, guint32 flag } } - CAMEL_STORE_UNLOCK(store, folder_lock); - return folder; } @@ -770,9 +766,7 @@ camel_store_get_folder_info(CamelStore *store, const char *top, guint32 flags, C !(flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED), NULL); - CAMEL_STORE_LOCK(store, folder_lock); info = CS_CLASS (store)->get_folder_info (store, top, flags, ex); - CAMEL_STORE_UNLOCK(store, folder_lock); if (info && (top == NULL || *top == '\0') && (flags & CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL) == 0) { if (info->uri && (store->flags & CAMEL_STORE_VTRASH)) @@ -784,7 +778,6 @@ camel_store_get_folder_info(CamelStore *store, const char *top, guint32 flags, C return info; } - static void free_folder_info (CamelStore *store, CamelFolderInfo *fi) { -- cgit v1.2.3