aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-02-11 18:02:02 +0800
committerMilan Crha <mcrha@src.gnome.org>2009-02-11 18:02:02 +0800
commitfe69a20c44e58908354a130a406b2facd18454ab (patch)
tree5658a4c148a5361af358072c41e463501b974d89
parentec49abcb7ce88f0549fa54a66d4523e5a355b942 (diff)
downloadgsoc2013-evolution-fe69a20c44e58908354a130a406b2facd18454ab.tar
gsoc2013-evolution-fe69a20c44e58908354a130a406b2facd18454ab.tar.gz
gsoc2013-evolution-fe69a20c44e58908354a130a406b2facd18454ab.tar.bz2
gsoc2013-evolution-fe69a20c44e58908354a130a406b2facd18454ab.tar.lz
gsoc2013-evolution-fe69a20c44e58908354a130a406b2facd18454ab.tar.xz
gsoc2013-evolution-fe69a20c44e58908354a130a406b2facd18454ab.tar.zst
gsoc2013-evolution-fe69a20c44e58908354a130a406b2facd18454ab.zip
** Fix for bug #569700
2009-02-11 Milan Crha <mcrha@redhat.com> ** Fix for bug #569700 * em-format-html.c: (emfh_gethttp): Stop reading from a network when operation was canceled. svn path=/trunk/; revision=37246
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-format-html.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 58e8f63f12..8e71d1564c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2009-02-11 Milan Crha <mcrha@redhat.com>
+ ** Fix for bug #569700
+
+ * em-format-html.c: (emfh_gethttp):
+ Stop reading from a network when operation was canceled.
+
+2009-02-11 Milan Crha <mcrha@redhat.com>
+
** Fix for bug #333716
* em-format-html.c: (emfh_gethttp):
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 21cbcf0e92..23926f8ed6 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -523,6 +523,10 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, int cancelled)
costream = camel_data_cache_add(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
do {
+ if (camel_operation_cancel_check (NULL)) {
+ n = -1;
+ break;
+ }
/* FIXME: progress reporting in percentage, can we get the length always? do we care? */
n = camel_stream_read(instream, buffer, sizeof (buffer));
if (n > 0) {