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 /mail/em-utils.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 'mail/em-utils.c')
| -rw-r--r-- | mail/em-utils.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c index 470020415c..8e7d48bd19 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1211,10 +1211,21 @@ is_only_text_part_in_this_level (GList *parts, level_len = dot - text_html_part->id; for (iter = parts; iter; iter = iter->next) { - EMailPart *part = iter->data; + EMailPart *part = E_MAIL_PART (iter->data); - if (!part || !part->mime_type || part == text_html_part || - part->is_hidden || part->is_attachment) + if (part == NULL) + continue; + + if (part == text_html_part) + continue; + + if (part->is_hidden) + continue; + + if (part->is_attachment) + continue; + + if (part->mime_type == NULL) continue; dot = strrchr (part->id, '.'); @@ -1253,7 +1264,7 @@ em_utils_message_to_html (CamelSession *session, guint32 flags, EMailPartList *parts_list, const gchar *append, - guint32 *validity_found) + EMailPartValidityFlags *validity_found) { EMailFormatter *formatter; EMailParser *parser = NULL; @@ -1262,7 +1273,7 @@ em_utils_message_to_html (CamelSession *session, EShell *shell; GtkWindow *window; EMailPart *hidden_text_html_part = NULL; - guint32 is_validity_found = 0; + EMailPartValidityFlags is_validity_found = 0; GQueue queue = G_QUEUE_INIT; GList *head, *link; |