[evolution-data-server] Remove camel_operation_uncancel().
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Remove camel_operation_uncancel().
- Date: Mon, 7 Nov 2011 01:11:14 +0000 (UTC)
commit bf65d17233ca95ba4377080b71d02de3513647ee
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Nov 5 00:42:35 2011 -0400
Remove camel_operation_uncancel().
Use g_cancellable_reset() instead.
camel/camel-operation.c | 19 -------------------
camel/camel-operation.h | 1 -
docs/reference/camel/camel-sections.txt | 1 -
docs/reference/camel/tmpl/camel-operation.sgml | 8 --------
docs/reference/camel/tmpl/camel-unused.sgml | 7 +++++++
5 files changed, 7 insertions(+), 29 deletions(-)
---
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index d2f3164..43825b7 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -240,25 +240,6 @@ camel_operation_cancel (CamelOperation *operation)
}
/**
- * camel_operation_uncancel:
- * @operation: a #CamelOperation
- *
- * Uncancel a cancelled operation.
- *
- * This is useful, if e.g. you need to do some cleaning up where a
- * cancellation lying around in the same thread will abort any
- * processing.
- **/
-void
-camel_operation_uncancel (CamelOperation *operation)
-{
- if (operation != NULL) {
- g_return_if_fail (CAMEL_IS_OPERATION (operation));
- g_cancellable_reset (G_CANCELLABLE (operation));
- }
-}
-
-/**
* 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 679b620..d14585d 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -69,7 +69,6 @@ GType camel_operation_get_type (void);
/* main thread functions */
GCancellable * camel_operation_new (void);
void camel_operation_cancel (CamelOperation *operation);
-void camel_operation_uncancel (CamelOperation *operation);
/* Since Camel methods pass around GCancellable pointers instead of
* CamelOperation pointers, it's more convenient to callers to take
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 7200966..a38c47a 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -1733,7 +1733,6 @@ camel_key_table_get_type
CamelOperation
camel_operation_new
camel_operation_cancel
-camel_operation_uncancel
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 bac3469..09a52ae 100644
--- a/docs/reference/camel/tmpl/camel-operation.sgml
+++ b/docs/reference/camel/tmpl/camel-operation.sgml
@@ -45,14 +45,6 @@ camel-operation
@operation:
-<!-- ##### FUNCTION camel_operation_uncancel ##### -->
-<para>
-
-</para>
-
- operation:
-
-
<!-- ##### 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 2ce5042..b409223 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -8477,6 +8477,13 @@ streams
@CAMEL_OPERATION_START:
@CAMEL_OPERATION_END:
+<!-- ##### FUNCTION camel_operation_uncancel ##### -->
+<para>
+
+</para>
+
+ operation:
+
<!-- ##### FUNCTION camel_operation_unref ##### -->
<para>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]