Attachment 945364 Details for Bug 1101476 – backported eds patch

[patch] backported eds patch

evolution-data-server-3.8.5-imapx-selected-folder-lock.patch (text/plain), 3.42 KB, created by Milan Crha on 2014-10-09 15:21:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2014-10-09 15:21:28 UTC

Size: 3.42 KB

patch

obsolete

>diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-selected-folder-lock evolution-data-server-3.8.5/camel/camel-imapx-server.c
>--- evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-selected-folder-lock	2014-10-09 17:16:25.108373296 +0200
>+++ evolution-data-server-3.8.5/camel/camel-imapx-server.c	2014-10-09 17:16:25.125373296 +0200
>@@ -1154,7 +1154,9 @@ imapx_command_start_next (CamelIMAPXServ
> 		return success;
> 	}
> 
>+	g_mutex_lock (&is->select_lock);
> 	folder = g_weak_ref_get (&is->select_pending);
>+	g_mutex_unlock (&is->select_lock);
> 	if (folder != NULL) {
> 		CamelIMAPXCommand *start_ic = NULL;
> 		GList *head, *link;
>@@ -1244,7 +1246,9 @@ imapx_command_start_next (CamelIMAPXServ
> 	}
> 
> 	/* See if any queued jobs on this select first */
>+	g_mutex_lock (&is->select_lock);
> 	folder = g_weak_ref_get (&is->select_folder);
>+	g_mutex_unlock (&is->select_lock);
> 	if (folder != NULL) {
> 		CamelIMAPXCommand *start_ic = NULL;
> 		GList *head, *link;
>@@ -1337,7 +1341,9 @@ imapx_command_start_next (CamelIMAPXServ
> 
> 		min_pri = first_ic->pri;
> 
>+		g_mutex_lock (&is->select_lock);
> 		folder = g_weak_ref_get (&is->select_folder);
>+		g_mutex_unlock (&is->select_lock);
> 
> 		head = camel_imapx_command_queue_peek_head_link (is->queue);
> 
>@@ -1498,7 +1504,9 @@ imapx_match_active_job (CamelIMAPXServer
> 		if (!(job->type & type))
> 			continue;
> 
>+		g_mutex_lock (&is->select_lock);
> 		folder = g_weak_ref_get (&is->select_folder);
>+		g_mutex_unlock (&is->select_lock);
> 		job_matches = camel_imapx_job_matches (job, folder, uid);
> 		g_clear_object (&folder);
> 
>@@ -1552,7 +1560,9 @@ imapx_expunge_uid_from_summary (CamelIMA
> 	CamelIMAPXFolder *ifolder;
> 	CamelMessageInfo *mi;
> 
>+	g_mutex_lock (&is->select_lock);
> 	folder = g_weak_ref_get (&is->select_folder);
>+	g_mutex_unlock (&is->select_lock);
> 	g_return_if_fail (folder != NULL);
> 
> 	ifolder = CAMEL_IMAPX_FOLDER (folder);
>@@ -1670,7 +1680,9 @@ imapx_untagged_expunge (CamelIMAPXServer
> 
> 	c (is->tagprefix, "expunged: %d\n", is->priv->context->id);
> 
>+	g_mutex_lock (&is->select_lock);
> 	folder = g_weak_ref_get (&is->select_folder);
>+	g_mutex_unlock (&is->select_lock);
> 
> 	if (folder != NULL) {
> 		gchar *uid;
>@@ -1723,7 +1735,9 @@ imapx_untagged_vanished (CamelIMAPXServe
> 	if (uids == NULL)
> 		return FALSE;
> 
>+	g_mutex_lock (&is->select_lock);
> 	folder = g_weak_ref_get (&is->select_folder);
>+	g_mutex_unlock (&is->select_lock);
> 	g_return_val_if_fail (folder != NULL, FALSE);
> 
> 	if (unsolicited) {
>@@ -1810,7 +1824,9 @@ imapx_untagged_exists (CamelIMAPXServer
> 	c (is->tagprefix, "exists: %d\n", is->priv->context->id);
> 	is->exists = is->priv->context->id;
> 
>+	g_mutex_lock (&is->select_lock);
> 	folder = g_weak_ref_get (&is->select_folder);
>+	g_mutex_unlock (&is->select_lock);
> 
> 	if (folder != NULL) {
> 		CAMEL_IMAPX_FOLDER (folder)->exists_on_server =
>@@ -2953,7 +2969,9 @@ imapx_completion (CamelIMAPXServer *is,
> 	if (camel_folder_change_info_changed (is->changes)) {
> 		CamelFolder *folder;
> 
>+		g_mutex_lock (&is->select_lock);
> 		folder = g_weak_ref_get (&is->select_folder);
>+		g_mutex_unlock (&is->select_lock);
> 		g_return_val_if_fail (folder != NULL, FALSE);
> 
> 		camel_folder_summary_save_to_db (folder->summary, NULL);
>@@ -3427,7 +3445,10 @@ imapx_idle_thread (gpointer data)
> 			if (is->idle->idle_exit)
> 				break;
> 
>+			g_mutex_lock (&is->select_lock);
> 			folder = g_weak_ref_get (&is->select_folder);
>+			g_mutex_unlock (&is->select_lock);
>+
> 			if (folder == NULL)
> 				break;
>

Actions: View | Diff

Attachments on bug 1101476: 945364