[evolution] Bug #630269 - Hang on mail operation cancel

[Milan Crha <mcrha src gnome org>]

commit 2e20af9240bba4ba457a6438df6aa84b9ed5af29
Author: Milan Crha <mcrha redhat com>
Date:   Wed Sep 22 10:36:34 2010 +0200

    Bug #630269 - Hang on mail operation cancel

 mail/mail-mt.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index e17d3c2..80a37c1 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -303,8 +303,11 @@ void mail_msg_cancel (guint msgid)
 
 	m = g_hash_table_lookup (mail_msg_active_table, GINT_TO_POINTER (msgid));
 
-	if (m != NULL && m->cancel != NULL && !camel_operation_cancel_check (m->cancel))
+	if (m != NULL && m->cancel != NULL && !camel_operation_cancel_check (m->cancel)) {
+		g_signal_handlers_block_by_func (m->cancel, mail_msg_cancelled, GINT_TO_POINTER (m->seq));
 		camel_operation_cancel (m->cancel);
+		g_signal_handlers_unblock_by_func (m->cancel, mail_msg_cancelled, GINT_TO_POINTER (m->seq));
+	}
 
 	g_mutex_unlock (mail_msg_lock);
 }