keep the windows charset filter around until we're done since if we set it

2004-01-09  Not Zed  <NotZed@Ximian.com>

        * em-format.c (em_format_format_text): keep the windows charset
        filter around until we're done since if we set it up we reference
        its memory.  Causes warnings and breaks message display.

        ** See bug #52637.

        * em-inline-filter.c (em_inline_filter_new): added a content-type
        paramter for the base content type.
        (em_inline_filter_finalize): free base content type.
        (emif_types[]): Added 'plain' parameter, indicates type needs
        plain parameters set on content type.
        (emif_add_part): inherit the full base type if it is set, for
        plain parts.

        * em-format-html.c (efh_text_plain): pass the part's content-type
        to the inline filter.

svn path=/trunk/; revision=24121

1 files changed, 3 insertions, 1 deletions

diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h
index 0afcdfa0b5..c2c82fee9b 100644
--- a/mail/em-inline-filter.h
+++ b/mail/em-inline-filter.h
@@ -42,6 +42,8 @@ typedef struct _EMInlineFilter {
 	int state;
 
 	CamelTransferEncoding base_encoding;
+	CamelContentType *base_type;
+
 	GByteArray *data;
 	char *filename;
 	GSList *parts;
@@ -52,7 +54,7 @@ typedef struct _EMInlineFilterClass {
 } EMInlineFilterClass;
 
 CamelType    em_inline_filter_get_type(void);
-EMInlineFilter *em_inline_filter_new(CamelTransferEncoding base_encoding);
+EMInlineFilter *em_inline_filter_new(CamelTransferEncoding base_encoding, CamelContentType *type);
 struct _CamelMultipart *em_inline_filter_get_multipart(EMInlineFilter *emif);
 
 #ifdef __cplusplus