diff options
| -rw-r--r-- | camel/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/camel-folder-summary.c | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 7885a339f8..8f1c231df9 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,10 @@ 2001-03-27 Not Zed <NotZed@Ximian.com> + * camel-folder-summary.c (camel_folder_summary_finalize): Unref + the html filter when done. + (summary_build_content_info): Disable using the html parser to + help index html mails until it gets sorted out. + * camel-vee-folder.c (folder_changed): Fix a cut n paste bug, we want uid_removed not uid_changed deref, fixes bug #1999. diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c index 8a21b8f93f..65de498783 100644 --- a/camel/camel-folder-summary.c +++ b/camel/camel-folder-summary.c @@ -199,13 +199,15 @@ camel_folder_summary_finalize (CamelObject *obj) e_memchunk_destroy(s->content_info_chunks); if (p->filter_index) - camel_object_unref ((CamelObject *)p->filter_index); + camel_object_unref((CamelObject *)p->filter_index); if (p->filter_64) - camel_object_unref ((CamelObject *)p->filter_64); + camel_object_unref((CamelObject *)p->filter_64); if (p->filter_qp) - camel_object_unref ((CamelObject *)p->filter_qp); + camel_object_unref((CamelObject *)p->filter_qp); if (p->filter_save) - camel_object_unref ((CamelObject *)p->filter_save); + camel_object_unref((CamelObject *)p->filter_save); + if (p->filter_html) + camel_object_unref((CamelObject *)p->filter_html); #ifdef ENABLE_THREADS g_mutex_free(p->summary_lock); @@ -2102,7 +2104,7 @@ summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, Cam } g_free(encoding); } - + charset = header_content_type_param(ct, "charset"); if (charset!=NULL && !(strcasecmp(charset, "us-ascii")==0 @@ -2123,6 +2125,9 @@ summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, Cam } } +#if 0 + /* this is disabled for now */ + /* also, should this go before/instead of the charset decoding? xml interfaces are utf8 already? */ if (header_content_type_is(ct, "text", "html")) { if (p->filter_html == NULL) p->filter_html = camel_mime_filter_html_new(); @@ -2130,6 +2135,7 @@ summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, Cam camel_mime_filter_reset((CamelMimeFilter *)p->filter_html); html_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_html); } +#endif /* and this filter actually does the indexing */ idx_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_index); |