aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorVadim Rutkovsky <vrutkovs@redhat.com>2013-02-14 01:46:30 +0800
committerVadim Rutkovsky <vrutkovs@redhat.com>2013-02-14 01:46:30 +0800
commitda975dadf59db4410ee1796b93fd9c423958b98d (patch)
treed5b1ffc14a5b47123cb5f6f70a6fee160d9dac38 /mail
parent3b11207dcbd01b5a18f93a406d267bb786829471 (diff)
downloadgsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar
gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar.gz
gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar.bz2
gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar.lz
gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar.xz
gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar.zst
gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.zip
Replace deprecated static mutexes
Diffstat (limited to 'mail')
-rw-r--r--mail/em-utils.c6
-rw-r--r--mail/mail-send-recv.c14
2 files changed, 10 insertions, 10 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c
index e215fa11e0..3a4e2289ea 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1193,7 +1193,7 @@ em_utils_selection_get_urilist (GtkSelectionData *selection_data,
/* ********************************************************************** */
static EProxy *emu_proxy = NULL;
-static GStaticMutex emu_proxy_lock = G_STATIC_MUTEX_INIT;
+static GMutex emu_proxy_lock;
static gpointer
emu_proxy_setup (gpointer data)
@@ -1210,13 +1210,13 @@ emu_proxy_setup (gpointer data)
EProxy *
em_utils_get_proxy (void)
{
- g_static_mutex_lock (&emu_proxy_lock);
+ g_mutex_lock (&emu_proxy_lock);
if (!emu_proxy) {
mail_call_main (MAIL_CALL_p_p, (MailMainFunc) emu_proxy_setup, NULL);
}
- g_static_mutex_unlock (&emu_proxy_lock);
+ g_mutex_unlock (&emu_proxy_lock);
return emu_proxy;
}
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index bde01abd22..a11b10662d 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -281,7 +281,7 @@ dialog_response (GtkDialog *gd,
}
}
-static GStaticMutex status_lock = G_STATIC_MUTEX_INIT;
+static GMutex status_lock;
static gchar *format_service_name (CamelService *service);
static gint
@@ -292,7 +292,7 @@ operation_status_timeout (gpointer data)
if (info->progress_bar) {
GtkProgressBar *progress_bar;
- g_static_mutex_lock (&status_lock);
+ g_mutex_lock (&status_lock);
progress_bar = GTK_PROGRESS_BAR (info->progress_bar);
@@ -308,7 +308,7 @@ operation_status_timeout (gpointer data)
g_free (tmp);
}
- g_static_mutex_unlock (&status_lock);
+ g_mutex_unlock (&status_lock);
return TRUE;
}
@@ -321,13 +321,13 @@ set_send_status (struct _send_info *info,
const gchar *desc,
gint pc)
{
- g_static_mutex_lock (&status_lock);
+ g_mutex_lock (&status_lock);
g_free (info->what);
info->what = g_strdup (desc);
info->pc = pc;
- g_static_mutex_unlock (&status_lock);
+ g_mutex_unlock (&status_lock);
}
static void
@@ -336,7 +336,7 @@ set_transport_service (struct _send_info *info,
{
CamelService *service;
- g_static_mutex_lock (&status_lock);
+ g_mutex_lock (&status_lock);
service = camel_session_ref_service (info->session, transport_uid);
@@ -349,7 +349,7 @@ set_transport_service (struct _send_info *info,
if (service != NULL)
g_object_unref (service);
- g_static_mutex_unlock (&status_lock);
+ g_mutex_unlock (&status_lock);
}
/* for camel operation status */