[evolution-data-server] camel_service_connect_sync can call camel_service_disconnect_sync

[Milan Crha <mcrha src gnome org>]

commit 9e8a4b9b6c11cfc28a3cde92e61dcf37e3a290f1
Author: Milan Crha <mcrha redhat com>
Date:   Wed Dec 8 14:47:37 2010 +0100

    camel_service_connect_sync can call camel_service_disconnect_sync

 camel/camel-service.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 1ae2a6a..fb78026 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -423,6 +423,7 @@ camel_service_connect_sync (CamelService *service,
                             GError **error)
 {
 	CamelServiceClass *class;
+	GCancellable *op;
 	gboolean ret = FALSE;
 
 	g_return_val_if_fail (CAMEL_IS_SERVICE (service), FALSE);
@@ -443,6 +444,7 @@ camel_service_connect_sync (CamelService *service,
 	 * the offline code can cancel it. */
 	camel_service_lock (service, CAMEL_SERVICE_CONNECT_OP_LOCK);
 	service->connect_op = camel_operation_new ();
+	op = service->connect_op;
 	camel_service_unlock (service, CAMEL_SERVICE_CONNECT_OP_LOCK);
 
 	service->status = CAMEL_SERVICE_CONNECTING;
@@ -451,8 +453,9 @@ camel_service_connect_sync (CamelService *service,
 	service->status = ret ? CAMEL_SERVICE_CONNECTED : CAMEL_SERVICE_DISCONNECTED;
 
 	camel_service_lock (service, CAMEL_SERVICE_CONNECT_OP_LOCK);
-	g_object_unref (service->connect_op);
-	service->connect_op = NULL;
+	g_object_unref (op);
+	if (op == service->connect_op)
+		service->connect_op = NULL;
 	camel_service_unlock (service, CAMEL_SERVICE_CONNECT_OP_LOCK);
 
 	camel_service_unlock (service, CAMEL_SERVICE_REC_CONNECT_LOCK);
@@ -488,8 +491,10 @@ camel_service_disconnect_sync (CamelService *service,
 
 	if (service->status != CAMEL_SERVICE_DISCONNECTED
 	    && service->status != CAMEL_SERVICE_DISCONNECTING) {
+		GCancellable *op;
 		camel_service_lock (service, CAMEL_SERVICE_CONNECT_OP_LOCK);
 		service->connect_op = camel_operation_new ();
+		op = service->connect_op;
 		camel_service_unlock (service, CAMEL_SERVICE_CONNECT_OP_LOCK);
 
 		service->status = CAMEL_SERVICE_DISCONNECTING;
@@ -499,8 +504,9 @@ camel_service_disconnect_sync (CamelService *service,
 		service->status = CAMEL_SERVICE_DISCONNECTED;
 
 		camel_service_lock (service, CAMEL_SERVICE_CONNECT_OP_LOCK);
-		g_object_unref (service->connect_op);
-		service->connect_op = NULL;
+		g_object_unref (op);
+		if (op == service->connect_op)
+			service->connect_op = NULL;
 		camel_service_unlock (service, CAMEL_SERVICE_CONNECT_OP_LOCK);
 	}