From 283a879d99a633c28597d2ed088781582dfe98a8 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Tue, 18 May 2004 07:48:19 +0000 Subject: ** Quick fix for #57434 2004-05-18 Not Zed ** Quick fix for #57434 * em-format.c (emf_format_clone): fix the FIXME about cloning headers shown. * em-format-html.c (efh_format_headers): only show rupert if we're showing rupert. * em-format-html-print.c (efhp_init): default show_rupert to off. * em-format-html.c (efh_init): default show_rupert to on. * em-format-html.h: added show_rupert bit. svn path=/trunk/; revision=25953 --- mail/em-format.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mail/em-format.c') diff --git a/mail/em-format.c b/mail/em-format.c index 9ffc37fc29..e585897d94 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -538,12 +538,17 @@ emf_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeM g_hash_table_destroy(emf->inline_table); emf->inline_table = g_hash_table_new(NULL, NULL); if (emfsource) { + struct _EMFormatHeader *h; + /* We clone the current state here */ g_hash_table_foreach(emfsource->inline_table, emf_clone_inlines, emf); emf->mode = emfsource->mode; g_free(emf->charset); emf->charset = g_strdup(emfsource->charset); - /* FIXME: clone headers shown */ + + em_format_clear_headers(emf); + for (h = (struct _EMFormatHeader *)emfsource->header_list.head; h->next; h = h->next) + em_format_add_header(emf, h->name, h->flags); } } -- cgit