diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-05-17 01:06:56 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-05-20 01:07:20 +0800 |
| commit | cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9 (patch) | |
| tree | 271b673b6e311d5cb44acdd0b6c1d1830aa6982e /em-format/e-mail-formatter.c | |
| parent | f6f11a1da2dfa2c7616cd18b36a44fefd66f0c75 (diff) | |
| download | gsoc2013-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 'em-format/e-mail-formatter.c')
| -rw-r--r-- | em-format/e-mail-formatter.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c index 4bc8dcd7fd..ad203d83ad 100644 --- a/em-format/e-mail-formatter.c +++ b/em-format/e-mail-formatter.c @@ -1035,16 +1035,18 @@ e_mail_formatter_format_text (EMailFormatter *formatter, CamelMimeFilter *windows = NULL; CamelStream *mem_stream = NULL; CamelDataWrapper *dw; + CamelContentType *mime_type; if (g_cancellable_is_cancelled (cancellable)) return; dw = CAMEL_DATA_WRAPPER (part->part); + mime_type = dw->mime_type; - if (formatter->priv->charset) { + if (formatter->priv->charset != NULL) { charset = formatter->priv->charset; - } else if (dw->mime_type - && (charset = camel_content_type_param (dw->mime_type, "charset")) + } else if (mime_type != NULL + && (charset = camel_content_type_param (mime_type, "charset")) && g_ascii_strncasecmp (charset, "iso-8859-", 9) == 0) { CamelStream *null; |