Emptied VeeStorePrivate, member wasn't used.

2001-09-26    <NotZed@Ximian.com>

        * camel-vee-store.c: Emptied VeeStorePrivate, member wasn't used.

        * camel-vee-folder.c (camel_vee_folder_set_expression): Lock
        changed list separately.
        (camel_vee_folder_remove_folder): "
        (camel_vee_folder_set_folders): Use changed_lock for changed list.
        (vee_refresh_info): Use changed_lock, also just grab the list,
        reset it in the lock, and do the work unlocked.
        (vee_sync): Use changed lock for changed list.
        (folder_changed): ".  All this kills a deadlock with sync/expunge.

        * camel-private.h (CamelVeeFolderPrivate): Added a new lock for
        the folders-changed list.
        (CamelVeeStorePrivate): Removed, defined in camel-vee-store.c,
        thanks to a pedantic.

svn path=/trunk/; revision=13163

1 files changed, 1 insertions, 11 deletions

diff --git a/camel/camel-private.h b/camel/camel-private.h
index 8d65e0ace1..32cde53068 100644
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -164,17 +164,6 @@ struct _CamelFolderSummaryPrivate {
 #define CAMEL_SUMMARY_UNLOCK(f, l)
 #endif
 
-struct _CamelVeeStorePrivate {
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_VEE_STORE_LOCK(f, l) (e_mutex_lock(((CamelVeeStore *)f)->priv->l))
-#define CAMEL_VEE_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelVeeStore *)f)->priv->l))
-#else
-#define CAMEL_VEE_STORE_LOCK(f, l)
-#define CAMEL_VEE_STORE_UNLOCK(f, l)
-#endif
-
 struct _CamelVeeFolderPrivate {
 	GList *folders;			/* lock using subfolder_lock before changing/accessing */
 	GList *folders_changed;		/* for list of folders that have changed between updates */
@@ -182,6 +171,7 @@ struct _CamelVeeFolderPrivate {
 #ifdef ENABLE_THREADS
 	GMutex *summary_lock;		/* for locking vfolder summary */
 	GMutex *subfolder_lock;		/* for locking the subfolder list */
+	GMutex *changed_lock;		/* for locking the folders-changed list */
 #endif
 };