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/em-format-html.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/em-format-html.c')
| -rw-r--r-- | mail/em-format-html.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c index f3209b8b89..9a7c87f105 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1614,7 +1614,7 @@ emfh_gethttp (struct _EMFormatHTMLJob *job, costream = camel_data_cache_add (emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL); do { - if (camel_operation_cancel_check (CAMEL_OPERATION (cancellable))) { + if (g_cancellable_is_cancelled (cancellable)) { n = -1; break; } |