use sensible variable name for set_lock_async

diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index be88010..cce5bef 100644 (file)
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -192,7 +192,7 @@ camel_folder_init (gpointer object, gpointer klass)
        folder->priv = g_malloc0(sizeof(*folder->priv));
        folder->priv->frozen = 0;
        folder->priv->changed_frozen = camel_folder_change_info_new();
-       folder->priv->async_rec_locks = FALSE;
+       folder->priv->skip_folder_lock = FALSE;
        g_static_rec_mutex_init(&folder->priv->lock);
        g_static_mutex_init(&folder->priv->change_lock);
 }
@@ -224,9 +224,9 @@ camel_folder_finalize (CamelObject *object)
 }
 
 void
-camel_folder_set_lock_async (CamelFolder *folder, gboolean async)
+camel_folder_set_lock_async (CamelFolder *folder, gboolean skip_folder_lock)
 {
-       folder->priv->async_rec_locks = async;
+       folder->priv->skip_folder_lock = skip_folder_lock;
 }
 
 CamelType

diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 5d753c4..5fbe52e 100644 (file)
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -234,7 +234,7 @@ void               camel_folder_sync                   (CamelFolder *folder,
                                                        gboolean expunge,
                                                        CamelException *ex);
 void              camel_folder_set_lock_async         (CamelFolder *folder,
-                                                       gboolean async);
+                                                       gboolean skip_folder_lock);
 
 CamelStore *       camel_folder_get_parent_store       (CamelFolder *folder);
 

diff --git a/camel/camel-private.h b/camel/camel-private.h
index a556f7e..51fc00f 100644 (file)
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -40,7 +40,7 @@ struct _CamelFolderPrivate {
        /* must require the 'change_lock' to access this */
        gint frozen;
        struct _CamelFolderChangeInfo *changed_frozen; /* queues changed events */
-       gboolean async_rec_locks;
+       gboolean skip_folder_lock;
 };
 
 #define CAMEL_FOLDER_LOCK(f, l) \
@@ -48,9 +48,9 @@ struct _CamelFolderPrivate {
 #define CAMEL_FOLDER_UNLOCK(f, l) \
        (g_static_mutex_unlock(&((CamelFolder *) (f))->priv->l))
 #define CAMEL_FOLDER_REC_LOCK(f, l) \
-       if (((CamelFolder *) (f))->priv->async_rec_locks == FALSE) g_static_rec_mutex_lock(&((CamelFolder *) (f))->priv->l);
+       if (((CamelFolder *) (f))->priv->skip_folder_lock == FALSE) g_static_rec_mutex_lock(&((CamelFolder *) (f))->priv->l);
 #define CAMEL_FOLDER_REC_UNLOCK(f, l) \
-       if (((CamelFolder *) (f))->priv->async_rec_locks == FALSE) g_static_rec_mutex_unlock(&((CamelFolder *) (f))->priv->l);
+       if (((CamelFolder *) (f))->priv->skip_folder_lock == FALSE) g_static_rec_mutex_unlock(&((CamelFolder *) (f))->priv->l);
 
 struct _CamelStorePrivate {
        GStaticRecMutex folder_lock;    /* for locking folder operations */