[evolution/kill-bonobo] Fix crash when printing an email.

[Matthew Barnes <mbarnes src gnome org>]

commit 46905edb53ecdc18f59c701cb5be3fd3829e9198
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jun 2 15:32:20 2009 -0400

    Fix crash when printing an email.
---
 mail/em-format-html-display.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 2a51bfa..e4aa4e0 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1293,6 +1293,10 @@ efhd_add_bar (EMFormatHTML *efh,
 	EMFormatHTMLDisplayPrivate *priv;
 	GtkWidget *widget;
 
+	/* XXX See note in efhd_message_add_bar(). */
+	if (!EM_IS_FORMAT_HTML_DISPLAY (efh))
+		return FALSE;
+
 	priv = EM_FORMAT_HTML_DISPLAY_GET_PRIVATE (efh);
 
 	widget = e_mail_attachment_bar_new ();
@@ -1315,6 +1319,10 @@ efhd_message_add_bar (EMFormat *emf,
 {
 	const gchar *classid = "attachment-bar";
 
+	/* XXX Apparently this installs the callback for -all-
+	 *     EMFormatHTML subclasses, not just this subclass.
+	 *     Bad idea.  So we have to filter out other types
+	 *     in the callback. */
 	em_format_html_add_pobject (
 		EM_FORMAT_HTML (emf),
 		sizeof (EMFormatHTMLPObject),