[evolution/gnome-3-0] Bug #651062 - Emit operation progress on the correct cancellable

[Milan Crha <mcrha src gnome org>]

commit eecafa06bd69a07d376f3e4b28c99eac45cb1012
Author: Milan Crha <mcrha redhat com>
Date:   Mon May 30 08:44:40 2011 +0200

    Bug #651062 - Emit operation progress on the correct cancellable

 mail/mail-send-recv.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 79018f3..60e7786 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -924,7 +924,7 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
 
 	get_folders (m->store, m->folders, m->finfo);
 
-	camel_operation_push_message (cancellable, _("Updating..."));
+	camel_operation_push_message (m->info->cancellable, _("Updating..."));
 
 	for (i=0;i<m->folders->len;i++) {
 		folder = e_mail_session_uri_to_folder_sync (
@@ -947,10 +947,10 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
 
 		if (m->info->state != SEND_CANCELLED)
 			camel_operation_progress (
-				cancellable, 100 * i / m->folders->len);
+				m->info->cancellable, 100 * i / m->folders->len);
 	}
 
-	camel_operation_pop_message (cancellable);
+	camel_operation_pop_message (m->info->cancellable);
 
 	if (cancellable)
 		g_signal_handler_disconnect (m->info->cancellable, handler_id);