aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-05-09 01:01:55 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-05-09 01:01:55 +0800
commit47a4b74f0788af977a0f039eda58485c00d101f2 (patch)
tree601463e34310c6933a00dd425735a5f11bd254fe /mail
parentbbe28c9d76daf7639d7b1ff7ae2754c098cf3ef6 (diff)
downloadgsoc2013-evolution-47a4b74f0788af977a0f039eda58485c00d101f2.tar
gsoc2013-evolution-47a4b74f0788af977a0f039eda58485c00d101f2.tar.gz
gsoc2013-evolution-47a4b74f0788af977a0f039eda58485c00d101f2.tar.bz2
gsoc2013-evolution-47a4b74f0788af977a0f039eda58485c00d101f2.tar.lz
gsoc2013-evolution-47a4b74f0788af977a0f039eda58485c00d101f2.tar.xz
gsoc2013-evolution-47a4b74f0788af977a0f039eda58485c00d101f2.tar.zst
gsoc2013-evolution-47a4b74f0788af977a0f039eda58485c00d101f2.zip
Make sure that we haven't been destroyed before we start writing to the
2003-05-07 Jeffrey Stedfast <fejj@ximian.com> * mail-display.c (mail_display_render): Make sure that we haven't been destroyed before we start writing to the html engine. Fixes bug #42333. svn path=/trunk/; revision=21132
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-display.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4cefc66794..c4cc81862f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-07 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-display.c (mail_display_render): Make sure that we haven't
+ been destroyed before we start writing to the html engine. Fixes
+ bug #42333.
+
2003-05-07 Not Zed <NotZed@Ximian.com>
** See bug #42456
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 5aa1dd1dff..bf8bc41c47 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -1814,6 +1814,11 @@ mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll)
g_return_if_fail (IS_MAIL_DISPLAY (md));
g_return_if_fail (GTK_IS_HTML (html));
+ if (!md->html) {
+ /* we've been destroyed */
+ return;
+ }
+
html_stream = gtk_html_begin (html);
if (!reset_scroll) {
/* This is a hack until there's a clean way to do this. */