From 7acaf0f527da269a34bf404647cde27f93c08d78 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 29 Apr 2008 08:35:05 +0000 Subject: ** Fix for bug #511337 2008-04-29 Milan Crha ** Fix for bug #511337 * em-format-html.h: (EMFormatHTMLState), (struct _EMFormatHTML): * em-format-html.c: (efh_init), (efh_format_done), (efh_format_timeout): Track state of the object to recognize whether rendering new content or doing nothing. * em-format-html-display.c: (efhd_can_process_attachment), (efhd_attachment_show), (efhd_attachment_popup), (efhd_attachment_image), (efhd_attachment_button): Do nothing when EMFormatHTML object's state is RENDERING, the puri object instance is not valid anyway. svn path=/trunk/; revision=35437 --- mail/em-format-html.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mail/em-format-html.c') diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 8e3878ab3f..53a6ffc8d8 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -170,6 +170,7 @@ efh_init(GObject *o) efh->text_html_flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES | CAMEL_MIME_FILTER_TOHTML_MARK_CITATION; efh->show_icon = TRUE; + efh->state = EM_FORMAT_HTML_STATE_NONE; } static void @@ -1330,6 +1331,7 @@ efh_format_done (struct _format_msg *m) m->format->load_http_now = FALSE; m->format->priv->format_id = -1; + m->format->state = EM_FORMAT_HTML_STATE_NONE; g_signal_emit_by_name(m->format, "complete"); } @@ -1398,6 +1400,8 @@ efh_format_timeout(struct _format_msg *m) mail_msg_unref(m); p->last_part = NULL; } else { + efh->state = EM_FORMAT_HTML_STATE_RENDERING; + if (p->last_part != m->message) { hstream = gtk_html_begin (efh->html); gtk_html_stream_printf (hstream, "
%s
", _("Formatting Message...")); -- cgit