diff options
author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-08 19:48:40 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-08 19:48:40 +0800 |
commit | 1107fea0f8edff76d5956426044c9afe41c387fa (patch) | |
tree | 3140debb1cef6c058425360e0c43b6c55da75f3a /mail/message-list.c | |
parent | ceda5ef420b4a4b97ce0011d49be3f96e857c9ef (diff) | |
parent | 88d5608a97ebaee9c04c3e8ac6b79278e824ecee (diff) | |
download | gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.gz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.bz2 gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.lz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.xz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.zst gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.zip |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'mail/message-list.c')
-rw-r--r-- | mail/message-list.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mail/message-list.c b/mail/message-list.c index 35071cf0d0..cca1c44de1 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -4977,20 +4977,16 @@ mail_regen_cancel (MessageList *ml) { /* cancel any outstanding regeneration requests, not we don't clear, they clear themselves */ if (ml->regen) { - GList *l; + GList *link; g_mutex_lock (ml->regen_lock); - l = ml->regen; - while (l) { - MailMsg *mm = l->data; + for (link = ml->regen; link != NULL; link = link->next) { + MailMsg *mm = link->data; GCancellable *cancellable; cancellable = e_activity_get_cancellable (mm->activity); - if (CAMEL_IS_OPERATION (cancellable)) - camel_operation_cancel ( - CAMEL_OPERATION (cancellable)); - l = l->next; + g_cancellable_cancel (cancellable); } g_mutex_unlock (ml->regen_lock); |