aboutsummaryrefslogtreecommitdiffstats
path: root/mail/e-mail-request.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-05-17 01:06:56 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-05-20 01:07:20 +0800
commitcd5a55f9812643109be6c2b0ed5d8f8ce655a4a9 (patch)
tree271b673b6e311d5cb44acdd0b6c1d1830aa6982e /mail/e-mail-request.c
parentf6f11a1da2dfa2c7616cd18b36a44fefd66f0c75 (diff)
downloadgsoc2013-evolution-cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9.tar
gsoc2013-evolution-cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9.tar.gz
gsoc2013-evolution-cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9.tar.bz2
gsoc2013-evolution-cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9.tar.lz
gsoc2013-evolution-cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9.tar.xz
gsoc2013-evolution-cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9.tar.zst
gsoc2013-evolution-cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9.zip
em-format cleanups.
Diffstat (limited to 'mail/e-mail-request.c')
-rw-r--r--mail/e-mail-request.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
index a4e229f94f..69b9a13533 100644
--- a/mail/e-mail-request.c
+++ b/mail/e-mail-request.c
@@ -156,9 +156,13 @@ handle_mail_request (GSimpleAsyncResult *res,
g_object_unref (raw_content);
} else {
+ if (mime_type == NULL)
+ mime_type = part->mime_type;
+
e_mail_formatter_format_as (
- formatter, &context, part, request->priv->output_stream,
- mime_type ? mime_type : part->mime_type, cancellable);
+ formatter, &context, part,
+ request->priv->output_stream,
+ mime_type, cancellable);
}
e_mail_part_unref (part);