[evolution] Bug 630118 - Endless recursive loop in mail_msg_cancel()

[Matthew Barnes <mbarnes src gnome org>]

commit 1fd0976706e25cdfcc9ddf895e4d74d6c849f23a
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Sep 21 09:09:22 2010 -0400

    Bug 630118 - Endless recursive loop in mail_msg_cancel()

 mail/mail-mt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index fbbe925..595cedf 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -303,7 +303,7 @@ void mail_msg_cancel (guint msgid)
 
 	m = g_hash_table_lookup (mail_msg_active_table, GINT_TO_POINTER (msgid));
 
-	if (m && m->cancel)
+	if (m != NULL && !camel_operation_cancel_check (m->cancel))
 		camel_operation_cancel (m->cancel);
 
 	g_mutex_unlock (mail_msg_lock);