diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-07-11 15:11:39 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-07-11 15:11:39 +0800 |
| commit | 553e4ff5af3c83aef7ac020e93638f0d3f536589 (patch) | |
| tree | 42a257aa38784a3e7c4b4f3035cf579ffd1b78dd /mail | |
| parent | 3d3cd4686c882d5efd947200fbc01f1fc834cba8 (diff) | |
| download | gsoc2013-evolution-553e4ff5af3c83aef7ac020e93638f0d3f536589.tar gsoc2013-evolution-553e4ff5af3c83aef7ac020e93638f0d3f536589.tar.gz gsoc2013-evolution-553e4ff5af3c83aef7ac020e93638f0d3f536589.tar.bz2 gsoc2013-evolution-553e4ff5af3c83aef7ac020e93638f0d3f536589.tar.lz gsoc2013-evolution-553e4ff5af3c83aef7ac020e93638f0d3f536589.tar.xz gsoc2013-evolution-553e4ff5af3c83aef7ac020e93638f0d3f536589.tar.zst gsoc2013-evolution-553e4ff5af3c83aef7ac020e93638f0d3f536589.zip | |
Take warning softly instead of a crash
svn path=/trunk/; revision=33799
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <sragavan@novell.com> + + * em-format-html-display.c: (efhd_attachment_button): Take warning + softly instead of a crash. + 2007-07-09 Chenthill Palanisamy <pchenthill@novell.com> reviewed by: Veerapuram Varadhan <vvaradhan@novell.com> 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); |