[evolution-data-server/camel-gobject: 17/331] Deprecate some CamelOperation functions.

[Matthew Barnes <mbarnes src gnome org>]

commit fc802004fb5972207ae59f267b26da1d17e0b965
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jan 3 13:00:15 2010 -0600

    Deprecate some CamelOperation functions.
    
    camel_operation_cancel_block()
    camel_operation_cancel_unblock()
    camel_operation_progress_count()

 camel/camel-operation.h                  |    9 ++++++---
 camel/providers/pop3/camel-pop3-folder.c |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-operation.h b/camel/camel-operation.h
index 0557fbf..dc54647 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -53,8 +53,6 @@ CamelOperation *camel_operation_register(CamelOperation *cc);
 void camel_operation_unregister (CamelOperation *cc);
 
 /* called internally by camel, for the current thread */
-void camel_operation_cancel_block(CamelOperation *cc);
-void camel_operation_cancel_unblock(CamelOperation *cc);
 gint camel_operation_cancel_check(CamelOperation *cc);
 gint camel_operation_cancel_fd(CamelOperation *cc);
 #ifdef HAVE_NSS
@@ -66,9 +64,14 @@ CamelOperation *camel_operation_registered(void);
 void camel_operation_start(CamelOperation *cc, const gchar *what, ...);
 void camel_operation_start_transient(CamelOperation *cc, const gchar *what, ...);
 void camel_operation_progress(CamelOperation *cc, gint pc);
-void camel_operation_progress_count(CamelOperation *cc, gint sofar);
 void camel_operation_end(CamelOperation *cc);
 
+#ifndef CAMEL_DISABLE_DEPRECATED
+void camel_operation_cancel_block(CamelOperation *cc);
+void camel_operation_cancel_unblock(CamelOperation *cc);
+void camel_operation_progress_count(CamelOperation *cc, gint sofar);
+#endif /* CAMEL_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* CAMEL_OPERATION_H */
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index f43fc52..ba5d1b0 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -152,7 +152,7 @@ cmd_builduid(CamelPOP3Engine *pe, CamelPOP3Stream *stream, gpointer data)
 
 	/* TODO; somehow work out the limit and use that for proper progress reporting
 	   We need a pointer to the folder perhaps? */
-	camel_operation_progress_count(NULL, fi->id);
+	camel_operation_progress (NULL, fi->id);
 
 	checksum = g_checksum_new (G_CHECKSUM_MD5);
 	mp = camel_mime_parser_new();