diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-display.c | 2 | ||||
| -rw-r--r-- | mail/e-mail-reader-utils.c | 3 | ||||
| -rw-r--r-- | mail/e-mail-request.c | 8 | ||||
| -rw-r--r-- | mail/em-utils.c | 21 | ||||
| -rw-r--r-- | mail/em-utils.h | 2 |
5 files changed, 26 insertions, 10 deletions
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 775936341e..00c5d2df4f 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -1200,7 +1200,7 @@ mail_parts_bind_dom (GObject *object, head = g_queue_peek_head_link (&queue); for (link = head; link != NULL; link = g_list_next (link)) { - EMailPart *part = link->data; + EMailPart *part = E_MAIL_PART (link->data); /* Iterate only the parts rendered in * the frame and all it's subparts. */ diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index f495c664a1..79945dc7a1 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -1329,7 +1329,8 @@ e_mail_reader_reply_to_message (EMailReader *reader, gchar *mail_uri; CamelObjectBag *registry; EMsgComposer *composer; - guint32 validity_pgp_sum = 0, validity_smime_sum = 0; + EMailPartValidityFlags validity_pgp_sum = 0; + EMailPartValidityFlags validity_smime_sum = 0; /* This handles quoting only selected text in the reply. If * nothing is selected or only whitespace is selected, fall 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); 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; diff --git a/mail/em-utils.h b/mail/em-utils.h index 1fe83077a1..c7ce5c90b4 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -72,7 +72,7 @@ gchar * em_utils_message_to_html (CamelSession *session, guint32 flags, struct _EMailPartList *parts_list, const gchar *append, - guint32 *validity_found); + EMailPartValidityFlags *validity_found); void em_utils_empty_trash (GtkWidget *parent, EMailSession *session); |