[evolution-data-server] IMAPX: Use a CamelOperation, not GCancellable in the parser thread

[Matthew Barnes <mbarnes src gnome org>]

commit e7e3b1e62105581724f972f4064e57cde91b5907
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Oct 1 07:25:42 2010 -0400

    IMAPX: Use a CamelOperation, not GCancellable in the parser thread

 camel/camel-operation.c                    |    2 ++
 camel/providers/imapx/camel-imapx-server.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index 860bf59..926dbd4 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -345,6 +345,8 @@ camel_operation_cancel_prfd (CamelOperation *operation)
 	if (operation == NULL)
 		return NULL;
 
+	g_return_val_if_fail (CAMEL_IS_OPERATION (operation), NULL);
+
 	LOCK ();
 
 	priv = operation->priv;
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 63f5e1a..a8c0587 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -4792,7 +4792,7 @@ imapx_parser_thread (gpointer d)
 	GError *local_error = NULL;
 
 	QUEUE_LOCK (is);
-	cancellable = g_cancellable_new ();
+	cancellable = camel_operation_new ();
 	is->cancellable = g_object_ref (cancellable);
 	QUEUE_UNLOCK (is);