diff options
Diffstat (limited to 'em-format')
| -rw-r--r-- | em-format/e-mail-formatter-headers.c | 5 | ||||
| -rw-r--r-- | em-format/e-mail-formatter-quote-attachment.c | 5 | ||||
| -rw-r--r-- | em-format/e-mail-formatter-text-html.c | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c index 9d7a5120ad..28d2322e9b 100644 --- a/em-format/e-mail-formatter-headers.c +++ b/em-format/e-mail-formatter-headers.c @@ -58,8 +58,6 @@ format_short_headers (EMailFormatter *formatter, { CamelMimePart *mime_part; GtkTextDirection direction; - const gchar *charset; - CamelContentType *ct; gchar *hdr_charset; gchar *evolution_imagesdir; gchar *subject = NULL; @@ -73,9 +71,6 @@ format_short_headers (EMailFormatter *formatter, mime_part = e_mail_part_ref_mime_part (part); direction = gtk_widget_get_default_direction (); - ct = camel_mime_part_get_content_type (mime_part); - charset = camel_content_type_param (ct, "charset"); - charset = camel_iconv_charset_name (charset); hdr_charset = e_mail_formatter_dup_charset (formatter); if (!hdr_charset) hdr_charset = e_mail_formatter_dup_default_charset (formatter); diff --git a/em-format/e-mail-formatter-quote-attachment.c b/em-format/e-mail-formatter-quote-attachment.c index 1a6b19408c..81a2a15c10 100644 --- a/em-format/e-mail-formatter-quote-attachment.c +++ b/em-format/e-mail-formatter-quote-attachment.c @@ -63,7 +63,7 @@ emfqe_attachment_format (EMailFormatterExtension *extension, empa = E_MAIL_PART_ATTACHMENT (part); - if (!empa->attachment_view_part_id) + if (!empa || !empa->attachment_view_part_id) return FALSE; attachment_view_part = e_mail_part_list_ref_part ( @@ -78,7 +78,8 @@ emfqe_attachment_format (EMailFormatterExtension *extension, mime_part = e_mail_part_ref_mime_part (part); text = e_mail_part_describe ( mime_part, - empa ? empa->snoop_mime_type : + empa->snoop_mime_type && *empa->snoop_mime_type ? + empa->snoop_mime_type : e_mail_part_get_mime_type (part)); g_object_unref (mime_part); diff --git a/em-format/e-mail-formatter-text-html.c b/em-format/e-mail-formatter-text-html.c index 17632fa03f..1065474a33 100644 --- a/em-format/e-mail-formatter-text-html.c +++ b/em-format/e-mail-formatter-text-html.c @@ -191,12 +191,10 @@ emfe_text_html_format (EMailFormatterExtension *extension, closing = g_utf8_strchr (pos, -1, '>'); /* Find where the actual tag name begins */ - tag = g_utf8_find_next_char (pos, NULL); - while ((tag = g_utf8_find_next_char (pos, NULL)) != NULL) { + while (tag = g_utf8_find_next_char (pos, NULL), tag != NULL) { gunichar c = g_utf8_get_char (tag); if (!g_unichar_isspace (c)) break; - } if (g_ascii_strncasecmp (tag, "style", 5) == 0) { |