Add a 'flushed' state variable to the private struct. (do_read): Set

2003-02-27  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-stream-filter.c: Add a 'flushed' state variable to the
	private struct.
	(do_read): Set p->flushed to TRUE after we call
	camel_mime_filter_complete() on all the filters.
	(do_reset): Set p->flushed to FALSE.
	(do_eos): Make sure the filters have been flushed before returning
	that the stream is at EOS.

	* camel-mime-filter-canon.c (complete): Don't add a eol -
	otherwise we will fail to verify some mutt signatures that do not
	have a blank line before the boundary line (and note that the last
	\n before the boundary really belongs to the boundary anyway) so
	#if 0 this code out for now.

svn path=/trunk/; revision=20096

1 files changed, 7 insertions, 0 deletions

diff --git a/camel/camel-mime-filter-canon.c b/camel/camel-mime-filter-canon.c
index a72f01c77f..43337ae856 100644
--- a/camel/camel-mime-filter-canon.c
+++ b/camel/camel-mime-filter-canon.c
@@ -195,6 +195,12 @@ complete(CamelMimeFilter *f, char *in, size_t len, size_t prespace, char **out,
 			while (o>starto && (o[-1] == ' ' || o[-1] == '\t' || o[-1]=='\r'))
 				o--;
 		}
+		
+#if 0
+		/* Note: #if 0'd out because we do not want to add a
+		 * \r\n for PGP/MIME verification if it isn't there in
+		 * the original content stream */
+		
 		/* check end of line canonicalisation */
 		if (o>starto) {
 			if (flags & CAMEL_MIME_FILTER_CANON_CRLF) {
@@ -208,6 +214,7 @@ complete(CamelMimeFilter *f, char *in, size_t len, size_t prespace, char **out,
 		
 		/* and always finish with an eol */
 		*o++ = '\n';
+#endif
 		
 		*outlen = o - *out;