From 553e4ff5af3c83aef7ac020e93638f0d3f536589 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Wed, 11 Jul 2007 07:11:39 +0000 Subject: Take warning softly instead of a crash svn path=/trunk/; revision=33799 --- mail/ChangeLog | 5 +++++ mail/em-format-html-display.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 7046494912..62669d73e1 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2007-07-11 Srinivasa Ragavan + + * em-format-html-display.c: (efhd_attachment_button): Take warning + softly instead of a crash. + 2007-07-09 Chenthill Palanisamy reviewed by: Veerapuram Varadhan diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 26540ee607..a6c9561826 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -1779,8 +1779,11 @@ efhd_attachment_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObje d(printf("adding attachment button/content\n")); info = (struct _attach_puri *)em_format_find_puri((EMFormat *)efh, pobject->classid); - g_assert(info != NULL); - g_assert(info->forward == NULL); + + if (!info || info->forward) { + g_warning ("unable to expand the attachment\n"); + return TRUE; + } if (efhd->priv->attachment_bar) { file = camel_mime_part_get_filename(info->puri.part); -- cgit