aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-09-22 16:36:34 +0800
committerMilan Crha <mcrha@redhat.com>2010-09-22 16:36:34 +0800
commit2e20af9240bba4ba457a6438df6aa84b9ed5af29 (patch)
treef1a321237766ac707f87c6cb8593628f1ea4658e
parent2168903b2396d09e11cd2b4d1f912d535215888a (diff)
downloadgsoc2013-evolution-2e20af9240bba4ba457a6438df6aa84b9ed5af29.tar
gsoc2013-evolution-2e20af9240bba4ba457a6438df6aa84b9ed5af29.tar.gz
gsoc2013-evolution-2e20af9240bba4ba457a6438df6aa84b9ed5af29.tar.bz2
gsoc2013-evolution-2e20af9240bba4ba457a6438df6aa84b9ed5af29.tar.lz
gsoc2013-evolution-2e20af9240bba4ba457a6438df6aa84b9ed5af29.tar.xz
gsoc2013-evolution-2e20af9240bba4ba457a6438df6aa84b9ed5af29.tar.zst
gsoc2013-evolution-2e20af9240bba4ba457a6438df6aa84b9ed5af29.zip
Bug #630269 - Hang on mail operation cancel
-rw-r--r--mail/mail-mt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index e17d3c2daf..80a37c15ec 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);
}