[evolution/email-factory-3-4: 16/38] CamelOperation API changes from Matthew Barnes.

[Srinivasa Ragavan <sragavan src gnome org>]

commit 9f541192445ad421f2fe846a9e605354302aa0d8
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Thu Nov 17 13:31:00 2011 +0530

    CamelOperation API changes from Matthew Barnes.

 libemail-engine/e-mail-utils.c |    4 +---
 libemail-utils/mail-mt.c       |    4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c
index 27f492a..647cdfa 100644
--- a/libemail-engine/e-mail-utils.c
+++ b/libemail-engine/e-mail-utils.c
@@ -335,7 +335,7 @@ try_open_book_client (EBookClient *book_client,
 		E_CLIENT (book_client), only_if_exists,
 		cancellable, try_open_book_client_cb, &data);
 
-	while (canceled = camel_operation_cancel_check (NULL),
+	while (canceled = g_cancellable_is_cancelled (cancellable),
 			!canceled && !e_flag_is_set (flag)) {
 		GTimeVal wait;
 
@@ -567,8 +567,6 @@ search_address_in_addressbooks (const gchar *address,
 
 		mail_cancel_hook_remove (hook_stop);
 
-		stop = stop || camel_operation_cancel_check (NULL);
-
 		if (stop && !cached_book && book_client) {
 			g_object_unref (book_client);
 		} else if (!stop && book_client && !cached_book) {
diff --git a/libemail-utils/mail-mt.c b/libemail-utils/mail-mt.c
index 4c3ee34..045db03 100644
--- a/libemail-utils/mail-mt.c
+++ b/libemail-utils/mail-mt.c
@@ -273,7 +273,7 @@ mail_msg_cancel (guint msgid)
 	g_mutex_unlock (mail_msg_lock);
 
 	if (cancellable != NULL) {
-		camel_operation_cancel (CAMEL_OPERATION (cancellable));
+		g_cancellable_cancel (cancellable);
 		g_object_unref (cancellable);
 	}
 }
@@ -330,7 +330,7 @@ mail_cancel_hook_remove (GHook *hook)
 void
 mail_cancel_all (void)
 {
-	camel_operation_cancel (NULL);
+	camel_operation_cancel_all ();
 
 	g_mutex_lock (mail_msg_lock);