Attachment 917876 Details for Bug 1111600 – proposed eds patch

[patch] proposed eds patch

eds.patch (text/plain), 1.68 KB, created by Milan Crha on 2014-07-14 14:03:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2014-07-14 14:03:16 UTC

Size: 1.68 KB

patch

obsolete

>diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-message-download-cancelled evolution-data-server-3.8.5/camel/camel-imapx-server.c
>--- evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-message-download-cancelled	2014-07-14 15:59:56.043503219 +0200
>+++ evolution-data-server-3.8.5/camel/camel-imapx-server.c	2014-07-14 15:59:56.047503179 +0200
>@@ -7048,6 +7048,7 @@ cancel_all_jobs (CamelIMAPXServer *is,
> {
> 	CamelIMAPXCommandQueue *queue;
> 	GList *head, *link;
>+	GError *error_copy = NULL;
> 
> 	/* Transfer all pending and active commands to a separate
> 	 * command queue to complete them without holding QUEUE_LOCK. */
>@@ -7071,6 +7072,12 @@ cancel_all_jobs (CamelIMAPXServer *is,
> 
> 	QUEUE_UNLOCK (is);
> 
>+	if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
>+		error_copy = g_error_copy (error);
>+		error_copy->domain = CAMEL_IMAPX_SERVER_ERROR;
>+		error_copy->code = CAMEL_IMAPX_SERVER_ERROR_TRY_RECONNECT;
>+	}
>+
> 	head = camel_imapx_command_queue_peek_head_link (queue);
> 
> 	for (link = head; link != NULL; link = g_list_next (link)) {
>@@ -7092,7 +7099,7 @@ cancel_all_jobs (CamelIMAPXServer *is,
> 			/* Insert an error into the CamelIMAPXCommand to be
> 			 * propagated when the completion callback function
> 			 * calls camel_imapx_command_set_error_if_failed(). */
>-			camel_imapx_job_set_error (job, error);
>+			camel_imapx_job_set_error (job, error_copy ? error_copy : error);
> 		} else {
> 			camel_imapx_job_cancel (job);
> 		}
>@@ -7104,6 +7111,9 @@ cancel_all_jobs (CamelIMAPXServer *is,
> 	}
> 
> 	camel_imapx_command_queue_free (queue);
>+
>+	if (error_copy)
>+		g_error_free (error_copy);
> }
> 
> /* ********************************************************************** */

Actions: View | Diff

Attachments on bug 1111600: 913716 | 917876 | 918090