[evolution] EMailRequest: Handle empty message bodies more gracefully.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] EMailRequest: Handle empty message bodies more gracefully.
- Date: Fri, 19 Jul 2013 16:38:49 +0000 (UTC)
commit 8a0bb568238483e65ba0e053ddca0e47fb01040f
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Jul 19 12:23:17 2013 -0400
EMailRequest: Handle empty message bodies more gracefully.
mail/e-mail-request.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
index 892065c..cf04abf 100644
--- a/mail/e-mail-request.c
+++ b/mail/e-mail-request.c
@@ -184,9 +184,14 @@ handle_mail_request (GSimpleAsyncResult *res,
context.part_list = NULL;
/* Convert the GString to GInputStream and send it back to WebKit */
- ba = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (request->priv->output_stream));
- if (!ba->data) {
- gchar *data = g_strdup_printf (_("Failed to load part '%s'"), part_id);
+ ba = camel_stream_mem_get_byte_array (
+ CAMEL_STREAM_MEM (request->priv->output_stream));
+ if (ba->data == NULL) {
+ gchar *data;
+
+ data = g_strdup_printf (
+ "<p align='center'>%s</p>",
+ _("The message has no text content."));
dd (printf ("%s", data));
g_byte_array_append (ba, (guchar *) data, strlen (data));
g_free (data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]