aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-format.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 997e62cb37..9cdc022bf4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-18 Dan Winship <danw@ximian.com>
+
+ * mail-format.c (mail_format_raw_message): Call
+ mail_content_loaded here rather than blocking if the message data
+ isn't available.
+
2001-09-17 <NotZed@Ximian.com>
* mail-ops.c (mail_get_folderinfo): Get folderinfo 1 at a time
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 1b55640faa..8e84aa2d13 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -204,6 +204,10 @@ mail_format_raw_message (CamelMimeMessage *mime_message, MailDisplay *md)
g_return_if_fail (CAMEL_IS_MIME_MESSAGE (mime_message));
+ if (!mail_content_loaded (CAMEL_DATA_WRAPPER (mime_message), md,
+ TRUE, NULL, NULL))
+ return;
+
mail_html_write (md->html, md->stream, "<table cellspacing=0 cellpadding=10 width=\"100%%\"><tr><td><tt>\n");
text = get_data_wrapper_text (CAMEL_DATA_WRAPPER (mime_message));