[evolution-data-server/gnome-3-0] Bug #652437 - NNTP messages is sometimes displayed as grey

[Milan Crha <mcrha src gnome org>]

commit 6c995c5a3290225f5db7c140872c0d0198bc8bd7
Author: Milan Crha <mcrha redhat com>
Date:   Mon Aug 22 19:20:33 2011 +0200

    Bug #652437 - NNTP messages is sometimes displayed as grey

 camel/providers/nntp/camel-nntp-folder.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 9c2b3ac..680cab4 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -224,6 +224,10 @@ nntp_folder_download_message (CamelNNTPFolder *nntp_folder,
 		if (stream) {
 			if (camel_stream_write_to_stream ((CamelStream *) nntp_store->stream, stream, cancellable, error) == -1)
 				goto fail;
+
+			if ((error && *error) || g_cancellable_set_error_if_cancelled (cancellable, error))
+				goto fail;
+
 			if (camel_stream_reset (stream, error) == -1)
 				goto fail;
 		} else {
@@ -243,6 +247,7 @@ nntp_folder_download_message (CamelNNTPFolder *nntp_folder,
 	return stream;
 
 fail:
+	camel_data_cache_remove (nntp_store->cache, "cache", msgid, NULL);
 	g_prefix_error (error, _("Cannot get message %s: "), msgid);
 
 	return NULL;