[evolution-mapi/gnome-2-30] camel-private.h update due to changes in bug #550414



commit 2aeb3cdc9d6cda2c2eee2c375db033303f4c63fd
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jun 7 10:25:03 2010 +0200

    camel-private.h update due to changes in bug #550414

 src/camel/camel-private.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/camel/camel-private.h b/src/camel/camel-private.h
index 3425f93..d0de90e 100644
--- a/src/camel/camel-private.h
+++ b/src/camel/camel-private.h
@@ -117,15 +117,15 @@ struct _CamelFolderSummaryPrivate {
 
 	struct _CamelIndex *index;
 	
-	GMutex *summary_lock;	/* for the summary hashtable/array */
-	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
-	GMutex *filter_lock;	/* for accessing any of the filtering/indexing stuff, since we share them */
-	GMutex *alloc_lock;	/* for setting up and using allocators */
-	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */
+	GStaticRecMutex summary_lock;	/* for the summary hashtable/array */
+	GStaticRecMutex io_lock;	/* load/save lock, for access to saved_count, etc */
+	GStaticRecMutex filter_lock;	/* for accessing any of the filtering/indexing stuff, since we share them */
+	GStaticRecMutex alloc_lock;	/* for setting up and using allocators */
+	GStaticRecMutex ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */
 };
 
-#define CAMEL_SUMMARY_LOCK(f, l) (g_mutex_lock(((CamelFolderSummary *)f)->priv->l))
-#define CAMEL_SUMMARY_UNLOCK(f, l) (g_mutex_unlock(((CamelFolderSummary *)f)->priv->l))
+#define CAMEL_SUMMARY_LOCK(f, l) (g_static_rec_mutex_lock (&((CamelFolderSummary *)f)->priv->l))
+#define CAMEL_SUMMARY_UNLOCK(f, l) (g_static_rec_mutex_unlock (&((CamelFolderSummary *)f)->priv->l))
 
 
 struct _CamelStoreSummaryPrivate {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]