evolution r37247 - branches/gnome-2-24/mail

[mcrha svn gnome org]

Author: mcrha
Date: Wed Feb 11 10:02:18 2009
New Revision: 37247
URL: http://svn.gnome.org/viewvc/evolution?rev=37247&view=rev

Log:
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.



Modified:
   branches/gnome-2-24/mail/ChangeLog
   branches/gnome-2-24/mail/em-format-html.c

Modified: branches/gnome-2-24/mail/em-format-html.c
==============================================================================
--- branches/gnome-2-24/mail/em-format-html.c	(original)
+++ branches/gnome-2-24/mail/em-format-html.c	Wed Feb 11 10:02:18 2009
@@ -521,6 +521,10 @@
 		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) {