[evolution/email-factory-3-4: 26/53] Add Cancellable to ops.

[Srinivasa Ragavan <sragavan src gnome org>]

commit b59caaea3d7cd707cb5701841b247e2fd4fcc536
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Wed Nov 30 14:07:15 2011 +0200

    Add Cancellable to ops.

 libemail-engine/mail-ops.c |    4 +++-
 libemail-engine/mail-ops.h |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index 68e97cf..8cf7dac 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -1759,6 +1759,7 @@ static MailMsgInfo multi_op_object = {
 
 void
 mail_operate_on_object(GObject *object, 
+		       GCancellable *cancellable,
 		       gboolean (*do_op) (GObject *object, gpointer data, GError **error),
 		       void (*done) (gboolean ret, gpointer data, GError *error), 
 		       gpointer data)
@@ -1771,7 +1772,8 @@ mail_operate_on_object(GObject *object,
 	m->data = data;
 	m->do_op = do_op;
 	m->done = done;
-
+	if (G_IS_CANCELLABLE (cancellable))
+		m->base.cancellable = cancellable;
 	mail_msg_unordered_push (m);
 }
 
diff --git a/libemail-engine/mail-ops.h b/libemail-engine/mail-ops.h
index e21214f..241fad3 100644
--- a/libemail-engine/mail-ops.h
+++ b/libemail-engine/mail-ops.h
@@ -98,6 +98,7 @@ void mail_execute_shell_command (CamelFilterDriver *driver, gint argc, gchar **a
 gint mail_disconnect_store (CamelStore *store);
 
 void mail_operate_on_object			(GObject *object, 
+						GCancellable *cancellable,
 		       	    			gboolean (*do_op) (GObject *object, gpointer data, GError **error),
 		            			void (*done) (gboolean ret, gpointer data, GError *error), 
 		            			gpointer data);