From 5ad0b6d8f7ee9244eb328b5951b98f8945e7b3cf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 18 May 2013 11:10:22 -0400 Subject: Add e_mail_part_id_has_substr(). --- modules/prefer-plain/e-mail-display-popup-prefer-plain.c | 3 ++- modules/prefer-plain/e-mail-parser-prefer-plain.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/prefer-plain') diff --git a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c index 3935263700..91df97cdb5 100644 --- a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c +++ b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c @@ -315,7 +315,8 @@ mail_display_popup_prefer_plain_update_actions (EMailDisplayPopupExtension *exte EMailPart *p = link->data; if (e_mail_part_id_has_prefix (p, prefix) && - (strstr (p->id, "text_html") || strstr (p->id, "plain_text"))) { + (e_mail_part_id_has_substr (p, "text_html") || + e_mail_part_id_has_substr (p, "plain_text"))) { const gchar *p_id; p_id = e_mail_part_get_id (p); diff --git a/modules/prefer-plain/e-mail-parser-prefer-plain.c b/modules/prefer-plain/e-mail-parser-prefer-plain.c index 8282b024ad..c09c70d7f8 100644 --- a/modules/prefer-plain/e-mail-parser-prefer-plain.c +++ b/modules/prefer-plain/e-mail-parser-prefer-plain.c @@ -275,7 +275,7 @@ empe_prefer_plain_parse (EMailParserExtension *extension, for (link = head; link != NULL; link = g_list_next (link)) { EMailPart *mail_part = link->data; - if (strstr (mail_part->id, ".text_html") != NULL) { + if (e_mail_part_id_has_substr (mail_part, ".text_html")) { has_html = TRUE; break; } -- cgit v1.2.3