aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-format.c5
2 files changed, 6 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index aba87e47a2..dee21a5be1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-14 Jeffrey Stedfast <fejj@ximian.com>
+
+ * em-format.c: Don't complain about message errors ("Internal
+ Error: ..."), instead silently fall back to display the message as
+ source. Fixes bug #56876.
+
2004-04-14 Not Zed <NotZed@Ximian.com>
* em-folder-view.c (emfv_set_folder_uri): ugh, use the queued
diff --git a/mail/em-format.c b/mail/em-format.c
index 1d67abbcc2..0894669a15 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -1082,7 +1082,6 @@ emf_multipart_appledouble(EMFormat *emf, CamelStream *stream, CamelMimePart *par
int len;
if (!CAMEL_IS_MULTIPART(mp)) {
- em_format_format_error(emf, stream, _("Internal error: expecting CamelMultipart, got \"%s\""), ((CamelObject *)mp)->klass->name);
em_format_format_source(emf, stream, part);
return;
}
@@ -1102,7 +1101,6 @@ emf_multipart_mixed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, con
int i, nparts, len;
if (!CAMEL_IS_MULTIPART(mp)) {
- em_format_format_error(emf, stream, _("Internal error: expecting CamelMultipart, got \"%s\""), ((CamelObject *)mp)->klass->name);
em_format_format_source(emf, stream, part);
return;
}
@@ -1126,7 +1124,6 @@ emf_multipart_alternative(EMFormat *emf, CamelStream *stream, CamelMimePart *par
CamelMimePart *best = NULL;
if (!CAMEL_IS_MULTIPART(mp)) {
- em_format_format_error(emf, stream, _("Internal error: expecting CamelMultipart, got \"%s\""), ((CamelObject *)mp)->klass->name);
em_format_format_source(emf, stream, part);
return;
}
@@ -1219,7 +1216,6 @@ emf_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c
EMFormatPURI *puri, *purin;
if (!CAMEL_IS_MULTIPART(mp)) {
- em_format_format_error(emf, stream, _("Internal error: expecting CamelMultipart, got \"%s\""), ((CamelObject *)mp)->klass->name);
em_format_format_source(emf, stream, part);
return;
}
@@ -1368,7 +1364,6 @@ emf_message_rfc822(EMFormat *emf, CamelStream *stream, CamelMimePart *part, cons
int len;
if (!CAMEL_IS_MIME_MESSAGE(dw)) {
- em_format_format_error(emf, stream, _("Internal error: expecting CamelMimeMessage, got \"%s\""), ((CamelObject *)dw)->klass->name);
em_format_format_source(emf, stream, part);
return;
}