From 704b78d23bf8d707707411608a3453250f2637a1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 6 Nov 2012 16:20:46 +0100 Subject: Replace deprecated GLib symbols (as of GLib 2.34.x) --- mail/message-list.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'mail/message-list.c') diff --git a/mail/message-list.c b/mail/message-list.c index da0be14fea..959193a653 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2578,7 +2578,7 @@ message_list_init (MessageList *message_list) message_list->cursor_uid = NULL; message_list->last_sel_single = FALSE; - message_list->regen_lock = g_mutex_new (); + g_mutex_init (&message_list->regen_lock); /* TODO: Should this only get the selection if we're realised? */ p = message_list->priv; @@ -2747,7 +2747,7 @@ message_list_finalize (GObject *object) g_free (message_list->frozen_search); g_free (message_list->cursor_uid); - g_mutex_free (message_list->regen_lock); + g_mutex_clear (&message_list->regen_lock); clear_selection (message_list, &priv->clipboard); @@ -4833,9 +4833,9 @@ regen_list_done (struct _regen_list_msg *m) } else build_flat (m->ml, m->summary, m->changes); - g_mutex_lock (m->ml->regen_lock); + g_mutex_lock (&m->ml->regen_lock); m->ml->regen = g_list_remove (m->ml->regen, m); - g_mutex_unlock (m->ml->regen_lock); + g_mutex_unlock (&m->ml->regen_lock); if (m->ml->regen == NULL && m->ml->pending_select_uid) { gchar *uid; @@ -4904,9 +4904,9 @@ regen_list_free (struct _regen_list_msg *m) camel_folder_change_info_free (m->changes); /* we have to poke this here as well since we might've been cancelled and regened wont get called */ - g_mutex_lock (m->ml->regen_lock); + g_mutex_lock (&m->ml->regen_lock); m->ml->regen = g_list_remove (m->ml->regen, m); - g_mutex_unlock (m->ml->regen_lock); + g_mutex_unlock (&m->ml->regen_lock); if (m->expand_state) xmlFreeDoc (m->expand_state); @@ -4925,9 +4925,9 @@ static MailMsgInfo regen_list_info = { static gboolean ml_regen_timeout (struct _regen_list_msg *m) { - g_mutex_lock (m->ml->regen_lock); + g_mutex_lock (&m->ml->regen_lock); m->ml->regen = g_list_prepend (m->ml->regen, m); - g_mutex_unlock (m->ml->regen_lock); + g_mutex_unlock (&m->ml->regen_lock); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ mail_msg_fast_ordered_push (m); @@ -4944,7 +4944,7 @@ mail_regen_cancel (MessageList *ml) if (ml->regen) { GList *link; - g_mutex_lock (ml->regen_lock); + g_mutex_lock (&ml->regen_lock); for (link = ml->regen; link != NULL; link = link->next) { MailMsg *mm = link->data; @@ -4954,7 +4954,7 @@ mail_regen_cancel (MessageList *ml) g_cancellable_cancel (cancellable); } - g_mutex_unlock (ml->regen_lock); + g_mutex_unlock (&ml->regen_lock); } /* including unqueued ones */ -- cgit v1.2.3