From 4e8f90650f6bee2d007a33afe1ea6d9fecf48a3c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 5 Nov 2011 00:22:33 -0400
Subject: [PATCH] Remove camel_operation_cancel_fd().

Use g_cancellable_get_fd() 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 |  9 ---------
 docs/reference/camel/tmpl/camel-unused.sgml    |  8 ++++++++
 5 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index 129a7aa..e196aa6 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -284,25 +284,6 @@ camel_operation_cancel_check (CamelOperation *operation)
 }
 
 /**
- * camel_operation_cancel_fd:
- * @operation: a #CamelOperation
- *
- * Retrieve a file descriptor that can be waited on (select, or poll)
- * for read, to asynchronously detect cancellation.
- *
- * Returns: The fd, or -1 if cancellation has not been registered
- * for this thread.
- **/
-gint
-camel_operation_cancel_fd (CamelOperation *operation)
-{
-	if (operation == NULL)
-		return -1;
-
-	return g_cancellable_get_fd (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 f133da6..fdc3d78 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -73,7 +73,6 @@ void		camel_operation_uncancel	(CamelOperation *operation);
 
 /* called internally by camel, for the current thread */
 gboolean	camel_operation_cancel_check	(CamelOperation *operation);
-gint		camel_operation_cancel_fd	(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 aaeef68..199c65e 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -1735,7 +1735,6 @@ camel_operation_new
 camel_operation_cancel
 camel_operation_uncancel
 camel_operation_cancel_check
-camel_operation_cancel_fd
 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 3d19a8c..2af2ede 100644
--- a/docs/reference/camel/tmpl/camel-operation.sgml
+++ b/docs/reference/camel/tmpl/camel-operation.sgml
@@ -62,15 +62,6 @@ camel-operation
 @Returns: 
 
 
-<!-- ##### FUNCTION camel_operation_cancel_fd ##### -->
-<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 c663652..4683294 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_fd ##### -->
+<para>
+
+</para>
+
+@operation: 
+@Returns: 
+
 <!-- ##### FUNCTION camel_operation_cancel_prfd ##### -->
 <para>
 
-- 
2.7.4