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

[Milan Crha <mcrha src gnome org>]

commit d51672681f6e43a7a9525ff0920cdf7473843579
Author: Milan Crha <mcrha redhat com>
Date:   Mon Aug 22 19:19:53 2011 +0200

    Bug #652437 - NNTP messages is sometimes displayed as grey

 camel/providers/nntp/camel-nntp-folder.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index de67d4c..9c5fa7d 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -226,6 +226,9 @@ nntp_folder_download_message (CamelNNTPFolder *nntp_folder,
 			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;
+
 			success = g_seekable_seek (
 				G_SEEKABLE (stream), 0,
 				G_SEEK_SET, cancellable, error);
@@ -248,6 +251,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;