[evolution-data-server] Add camel_operation_cancel_all().

[Matthew Barnes <mbarnes src gnome org>]

commit 44104f99d91394e346da962b9eb553332dbc8ae0
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 5 01:00:46 2011 -0400

    Add camel_operation_cancel_all().
    
    Replaces camel_operation_cancel(NULL).
    
    For non-NULL cases, use g_cancellable_cancel() instead.

 camel/camel-operation.c                        |   33 ++++++++---------------
 camel/camel-operation.h                        |    4 +--
 camel/providers/imapx/camel-imapx-server.c     |    2 +-
 docs/reference/camel/camel-sections.txt        |    2 +-
 docs/reference/camel/tmpl/camel-operation.sgml |    4 +-
 docs/reference/camel/tmpl/camel-unused.sgml    |    7 +++++
 6 files changed, 24 insertions(+), 28 deletions(-)
---
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index 43825b7..b7a0f22 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -206,37 +206,28 @@ camel_operation_new (void)
 }
 
 /**
- * camel_operation_cancel:
- * @operation: a #CamelOperation
+ * camel_operation_cancel_all:
  *
- * Cancel a given operation.  If @operation is %NULL then all outstanding
- * operations are cancelled.
+ * Cancel all outstanding operations.
  **/
 void
-camel_operation_cancel (CamelOperation *operation)
+camel_operation_cancel_all (void)
 {
-	if (operation != NULL) {
-		g_return_if_fail (CAMEL_IS_OPERATION (operation));
+	GList *link;
 
-		g_cancellable_cancel (G_CANCELLABLE (operation));
-	} else {
-		GList *link;
-
-		LOCK ();
-
-		link = g_queue_peek_head_link (&operation_list);
+	LOCK ();
 
-		while (link != NULL) {
-			operation = link->data;
+	link = g_queue_peek_head_link (&operation_list);
 
-			if (operation != NULL)
-				camel_operation_cancel (operation);
+	while (link != NULL) {
+		GCancellable *cancellable = link->data;
 
-			link = g_list_next (link);
-		}
+		g_cancellable_cancel (cancellable);
 
-		UNLOCK ();
+		link = g_list_next (link);
 	}
+
+	UNLOCK ();
 }
 
 /**
diff --git a/camel/camel-operation.h b/camel/camel-operation.h
index d14585d..6489755 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -65,10 +65,8 @@ struct _CamelOperationClass {
 };
 
 GType		camel_operation_get_type	(void);
-
-/* main thread functions */
 GCancellable *	camel_operation_new		(void);
-void		camel_operation_cancel		(CamelOperation *operation);
+void		camel_operation_cancel_all	(void);
 
 /* Since Camel methods pass around GCancellable pointers instead of
  * CamelOperation pointers, it's more convenient to callers to take
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 24eab1a..3632d60 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -2313,7 +2313,7 @@ imapx_command_idle_stop (CamelIMAPXServer *is,
 		is->state = IMAPX_SHUTDOWN;
 		is->parser_quit = TRUE;
 		if (is->cancellable)
-			camel_operation_cancel (CAMEL_OPERATION (is->cancellable));
+			g_cancellable_cancel (is->cancellable);
 		return FALSE;
 	}
 
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index a38c47a..9222e59 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -1732,7 +1732,7 @@ camel_key_table_get_type
 <FILE>camel-operation</FILE>
 CamelOperation
 camel_operation_new
-camel_operation_cancel
+camel_operation_cancel_all
 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 09a52ae..f25955d 100644
--- a/docs/reference/camel/tmpl/camel-operation.sgml
+++ b/docs/reference/camel/tmpl/camel-operation.sgml
@@ -37,12 +37,12 @@ camel-operation
 @Returns: 
 
 
-<!-- ##### FUNCTION camel_operation_cancel ##### -->
+<!-- ##### FUNCTION camel_operation_cancel_all ##### -->
 <para>
 
 </para>
 
- operation: 
+ void: 
 
 
 <!-- ##### FUNCTION camel_operation_push_message ##### -->
diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml
index b409223..a4dc572 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -8368,6 +8368,13 @@ streams
 @store: 
 @stay_synchronized: 
 
+<!-- ##### FUNCTION camel_operation_cancel ##### -->
+<para>
+
+</para>
+
+ operation: 
+
 <!-- ##### FUNCTION camel_operation_cancel_block ##### -->
 <para>