summaryrefslogtreecommitdiff
path: root/camel/camel-provider.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-02-23 18:06:18 +0000
committerMatthew Barnes <mbarnes@src.gnome.org>2007-02-23 18:06:18 +0000
commit518f4b70d2b8536dcda3e817fed59a23c5891502 (patch)
tree8704ce63192724fd901d1fbb6762aa06938afc98 /camel/camel-provider.c
parent7650b4cb47d1b5b783e085b6a0a3408fa644445e (diff)
downloadevolution-data-server-518f4b70d2b8536dcda3e817fed59a23c5891502.tar.gz
** Fixes bug #356177
2007-02-23 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #356177 * libedataserver/e-msgport.h: Deprecate EMutex. * camel/camel-folder.c: * camel/camel-object.c: * camel/camel-private.h: * camel/camel-provider.c: * camel/camel-service.c: * camel/camel-store.c: * camel/camel-text-index.c: * camel/providers/groupwise/camel-groupwise-folder.c: * camel/providers/groupwise/camel-groupwise-private.h: * camel/providers/groupwise/camel-groupwise-store.c: * camel/providers/imap/camel-imap-command.c: * camel/providers/imap/camel-imap-folder.c: * camel/providers/imap/camel-imap-private.h: * camel/providers/imap/camel-imap-store.c: * camel/providers/imap4/camel-imap4-folder.c: * camel/providers/imap4/camel-imap4-store.c: * camel/providers/nntp/camel-nntp-folder.c: * camel/providers/nntp/camel-nntp-store.c: Migrate from EMutex to GStaticMutex or GStaticRecMutex. svn path=/trunk/; revision=7628
Diffstat (limited to 'camel/camel-provider.c')
-rw-r--r--camel/camel-provider.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
index 2c4c760ae..8639229cf 100644
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -51,10 +51,10 @@
static GHashTable *module_table;
/* table of CamelProvider's */
static GHashTable *provider_table;
-static EMutex *provider_lock;
+static GStaticRecMutex provider_lock = G_STATIC_REC_MUTEX_INIT;
-#define LOCK() e_mutex_lock(provider_lock);
-#define UNLOCK() e_mutex_unlock(provider_lock);
+#define LOCK() (g_static_rec_mutex_lock(&provider_lock))
+#define UNLOCK() (g_static_rec_mutex_unlock(&provider_lock))
/* The vfolder provider is always available */
static CamelProvider vee_provider = {
@@ -76,7 +76,6 @@ static pthread_once_t setup_once = PTHREAD_ONCE_INIT;
static void
provider_setup(void)
{
- provider_lock = e_mutex_new(E_MUTEX_REC);
module_table = g_hash_table_new(camel_strcase_hash, camel_strcase_equal);
provider_table = g_hash_table_new(camel_strcase_hash, camel_strcase_equal);