[evolution-data-server] Remove camel_operation_cancel_check().

[Matthew Barnes <mbarnes src gnome org>]

commit cf1b1e45b70b68165795451125db0003e60af610
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 5 00:36:17 2011 -0400

    Remove camel_operation_cancel_check().
    
    Use g_cancellable_is_cancelled() instead.

 camel/camel-operation.c                        |   25 ------------------------
 camel/camel-operation.h                        |    3 --
 camel/providers/imapx/camel-imapx-store.c      |    5 ----
 docs/reference/camel/camel-sections.txt        |    1 -
 docs/reference/camel/tmpl/camel-operation.sgml |    9 --------
 docs/reference/camel/tmpl/camel-unused.sgml    |    8 +++++++
 6 files changed, 8 insertions(+), 43 deletions(-)
---
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index e196aa6..d2f3164 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -259,31 +259,6 @@ camel_operation_uncancel (CamelOperation *operation)
 }
 
 /**
- * camel_operation_cancel_check:
- * @operation: a #CamelOperation
- *
- * Check if cancellation has been applied to @operation.
- *
- * Returns: %TRUE if the operation has been cancelled
- **/
-gboolean
-camel_operation_cancel_check (CamelOperation *operation)
-{
-	gboolean cancelled;
-
-	if (operation == NULL)
-		return FALSE;
-
-	LOCK ();
-
-	cancelled = g_cancellable_is_cancelled (G_CANCELLABLE (operation));
-
-	UNLOCK ();
-
-	return cancelled;
-}
-
-/**
  * camel_operation_push_message:
  * @cancellable: a #GCancellable or %NULL
  * @format: a standard printf() format string
diff --git a/camel/camel-operation.h b/camel/camel-operation.h
index fdc3d78..679b620 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -71,9 +71,6 @@ GCancellable *	camel_operation_new		(void);
 void		camel_operation_cancel		(CamelOperation *operation);
 void		camel_operation_uncancel	(CamelOperation *operation);
 
-/* called internally by camel, for the current thread */
-gboolean	camel_operation_cancel_check	(CamelOperation *operation);
-
 /* Since Camel methods pass around GCancellable pointers instead of
  * CamelOperation pointers, it's more convenient to callers to take
  * a GCancellable pointer and just return silently if the pointer is
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index b1342d2..7e1b626 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -165,11 +165,6 @@ camel_imapx_store_get_server (CamelIMAPXStore *istore,
 {
 	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, cancellable, error);
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 199c65e..7200966 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -1734,7 +1734,6 @@ CamelOperation
 camel_operation_new
 camel_operation_cancel
 camel_operation_uncancel
-camel_operation_cancel_check
 camel_operation_push_message
 camel_operation_pop_message
 camel_operation_progress
diff --git a/docs/reference/camel/tmpl/camel-operation.sgml b/docs/reference/camel/tmpl/camel-operation.sgml
index 2af2ede..bac3469 100644
--- a/docs/reference/camel/tmpl/camel-operation.sgml
+++ b/docs/reference/camel/tmpl/camel-operation.sgml
@@ -53,15 +53,6 @@ camel-operation
 @operation: 
 
 
-<!-- ##### FUNCTION camel_operation_cancel_check ##### -->
-<para>
-
-</para>
-
- operation: 
- Returns: 
-
-
 <!-- ##### FUNCTION camel_operation_push_message ##### -->
 <para>
 
diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml
index 4683294..2ce5042 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -8375,6 +8375,14 @@ streams
 
 @cc: 
 
+<!-- ##### FUNCTION camel_operation_cancel_check ##### -->
+<para>
+
+</para>
+
+ operation: 
+ Returns: 
+
 <!-- ##### FUNCTION camel_operation_cancel_fd ##### -->
 <para>