evolution r36289 - trunk/mail

[mcrha svn gnome org]

Author: mcrha
Date: Tue Sep  9 15:32:31 2008
New Revision: 36289
URL: http://svn.gnome.org/viewvc/evolution?rev=36289&view=rev

Log:
2008-09-09  Milan Crha  <mcrha redhat com>

	** Fix for bug #493298

	* em-format-html-display.c: (efhd_image): Do not try to access widget
	of the pury when the operation has been cancelled.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-format-html-display.c

Modified: trunk/mail/em-format-html-display.c
==============================================================================
--- trunk/mail/em-format-html-display.c	(original)
+++ trunk/mail/em-format-html-display.c	Tue Sep  9 15:32:31 2008
@@ -61,6 +61,7 @@
 #include <camel/camel-cipher-context.h>
 #include <camel/camel-folder.h>
 #include <camel/camel-string-utils.h>
+#include <camel/camel-operation.h>
 
 #include <misc/e-cursors.h>
 #include <e-util/e-util.h>
@@ -1249,7 +1250,12 @@
 	info->handle = handle;
 	info->shown = TRUE;
 	info->snoop_mime_type = ((EMFormat *) efh)->snoop_mime_type;
-	info->fit_width = ((GtkWidget *)((EMFormatHTML *)info->puri.format)->html)->allocation.width - 12;
+	if (camel_operation_cancel_check (NULL) || !info->puri.format || !((EMFormatHTML *)info->puri.format)->html) {
+		/* some fake value, we are cancelled anyway, thus doesn't matter */
+		info->fit_width = 256;
+	} else {
+		info->fit_width = ((GtkWidget *)((EMFormatHTML *)info->puri.format)->html)->allocation.width - 12;
+	}
 
 	camel_stream_printf(stream, "<td><object classid=\"%s\"></object></td>", classid);
 	g_free(classid);