add a CamelOperation for overriding status handler.

2003-07-29  Not Zed  <NotZed@Ximian.com>

        * mail-folder-cache.c (mail_note_store): add a CamelOperation for
        overriding status handler.

        * mail-send-recv.c (receive_update_got_store): Pass our own cancel
        handle to get_folderinfo and mail_note_store.
        (mail_send_receive, mail_receive_uri): Same for get_store.

        * mail-ops.c (mail_get_store, mail_get_folderinfo): Add a
        CamelOperation argument, for overriding the status handler.  Fixed
        most calles to pass NULL to use the default.

svn path=/trunk/; revision=22056

1 files changed, 12 insertions, 2 deletions

diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index f3469bf3e6..7a40e99c83 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1167,12 +1167,17 @@ static struct _mail_msg_op get_folderinfo_op = {
 };
 
 int
-mail_get_folderinfo (CamelStore *store, void (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data)
+mail_get_folderinfo (CamelStore *store, CamelOperation *op, void (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data)
 {
 	struct _get_folderinfo_msg *m;
 	int id;
 
 	m = mail_msg_new(&get_folderinfo_op, NULL, sizeof(*m));
+	if (op) {
+		camel_operation_unref(m->msg.cancel);
+		m->msg.cancel = op;
+		camel_operation_ref(op);
+	}
 	m->store = store;
 	camel_object_ref(store);
 	m->done = done;
@@ -1379,12 +1384,17 @@ static struct _mail_msg_op get_store_op = {
 };
 
 int
-mail_get_store (const char *uri, void (*done) (char *uri, CamelStore *store, void *data), void *data)
+mail_get_store (const char *uri, CamelOperation *op, void (*done) (char *uri, CamelStore *store, void *data), void *data)
 {
 	struct _get_store_msg *m;
 	int id;
 	
 	m = mail_msg_new (&get_store_op, NULL, sizeof (*m));
+	if (op) {
+		camel_operation_unref(m->msg.cancel);
+		m->msg.cancel = op;
+		camel_operation_ref(op);
+	}
 	m->uri = g_strdup (uri);
 	m->data = data;
 	m->done = done;