[evolution-data-server/gnome-2-32] Bug 630150 - imapx attempts to connect to server when already cancelled

[David Woodhouse <dwmw2 src gnome org>]

commit c7ebacd8f301fa8e936cd0a2e67a9950d402aa3a
Author: David Woodhouse <David Woodhouse intel com>
Date:   Mon Sep 20 13:30:13 2010 +0100

    Bug 630150 - imapx attempts to connect to server when already cancelled

 camel/providers/imapx/camel-imapx-store.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 2786b62..4d2d656 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -236,6 +236,11 @@ camel_imapx_store_get_server (CamelIMAPXStore *istore, const gchar *folder_name,
 {
 	CamelIMAPXServer *server = NULL;
 
+	if (camel_operation_cancel_check(NULL)) {
+		g_set_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED,
+			     _("Cancelled"));
+		return NULL;
+	}
 	camel_service_lock (CAMEL_SERVICE (istore), CAMEL_SERVICE_REC_CONNECT_LOCK);
 
 	server = camel_imapx_conn_manager_get_connection (istore->con_man, folder_name, error);