diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-05-17 01:10:26 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-05-20 01:07:20 +0800 |
commit | c025ffbb296501d2da8cba78aa6a14008055cf87 (patch) | |
tree | 1ef1bb4d02d699fc67e731e54bb1017852be4d83 /modules | |
parent | cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9 (diff) | |
download | gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar.gz gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar.bz2 gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar.lz gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar.xz gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar.zst gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.zip |
Add e_mail_part_get_id().
Diffstat (limited to 'modules')
5 files changed, 22 insertions, 12 deletions
diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c index 7abcf934fa..9c477bd2c8 100644 --- a/modules/audio-inline/e-mail-formatter-audio-inline.c +++ b/modules/audio-inline/e-mail-formatter-audio-inline.c @@ -265,7 +265,8 @@ emfe_audio_inline_format (EMailFormatterExtension *extension, str = g_strdup_printf ( "<object type=\"application/vnd.evolution.widget.audio-inline\" " "width=\"100%%\" height=\"auto\" data=\"%s\" id=\"%s\"></object>", - part->id, part->id); + e_mail_part_get_id (part), + e_mail_part_get_id (part)); camel_stream_write_string (stream, str, cancellable, NULL); diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c index 02ae152718..9f274ced20 100644 --- a/modules/itip-formatter/e-mail-formatter-itip.c +++ b/modules/itip-formatter/e-mail-formatter-itip.c @@ -115,7 +115,7 @@ emfe_itip_format (EMailFormatterExtension *extension, uri = e_mail_part_build_uri ( folder, message_uid, - "part_id", G_TYPE_STRING, part->id, + "part_id", G_TYPE_STRING, e_mail_part_get_id (part), "mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_RAW, "formatter_default_charset", G_TYPE_STRING, default_charset, "formatter_charset", G_TYPE_STRING, charset, @@ -129,7 +129,9 @@ emfe_itip_format (EMailFormatterExtension *extension, "<iframe width=\"100%%\" height=\"auto\"" " frameborder=\"0\" src=\"%s\" name=\"%s\" id=\"%s\"></iframe>" "</div>", - uri, part->id, part->id); + uri, + e_mail_part_get_id (part), + e_mail_part_get_id (part)); g_free (uri); } 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 2be2532eda..9b7de92f53 100644 --- a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c +++ b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c @@ -316,13 +316,16 @@ mail_display_popup_prefer_plain_update_actions (EMailDisplayPopupExtension *exte if (g_str_has_prefix (p->id, prefix) && (strstr (p->id, "text_html") || strstr (p->id, "plain_text"))) { + const gchar *p_id; - pos = strstr (p->id, ".alternative-prefer-plain."); + p_id = e_mail_part_get_id (p); + + pos = strstr (p_id, ".alternative-prefer-plain."); if (is_text_plain) { if (strstr (pos + ID_LEN, "text_html") != NULL) { action_name = "show-text-html-part"; - set_text_html_id (pp_extension, p->id); + set_text_html_id (pp_extension, p_id); set_text_plain_id (pp_extension, NULL); break; } @@ -330,7 +333,7 @@ mail_display_popup_prefer_plain_update_actions (EMailDisplayPopupExtension *exte if (strstr (pos + ID_LEN, "plain_text") != NULL) { action_name = "show-plain-text-part"; set_text_html_id (pp_extension, NULL); - set_text_plain_id (pp_extension, p->id); + set_text_plain_id (pp_extension, p_id); break; } } diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c b/modules/text-highlight/e-mail-formatter-text-highlight.c index 286e356c51..11fc546d74 100644 --- a/modules/text-highlight/e-mail-formatter-text-highlight.c +++ b/modules/text-highlight/e-mail-formatter-text-highlight.c @@ -313,7 +313,7 @@ emfe_text_highlight_format (EMailFormatterExtension *extension, uri = e_mail_part_build_uri ( folder, message_uid, - "part_id", G_TYPE_STRING, part->id, + "part_id", G_TYPE_STRING, e_mail_part_get_id (part), "mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_RAW, "__formatas", G_TYPE_STRING, syntax, "formatter_default_charset", G_TYPE_STRING, default_charset, @@ -330,7 +330,9 @@ emfe_text_highlight_format (EMailFormatterExtension *extension, " style=\"border: 1px solid #%06x; background-color: #%06x;\">" "</iframe>" "</div>", - part->id, part->id, uri, + e_mail_part_get_id (part), + e_mail_part_get_id (part), + uri, e_rgba_to_value ( e_mail_formatter_get_color ( formatter, E_MAIL_FORMATTER_COLOR_FRAME)), diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c index f2ab3cc179..6baa818138 100644 --- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c +++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c @@ -115,7 +115,7 @@ emfe_vcard_inline_format (EMailFormatterExtension *extension, uri = e_mail_part_build_uri ( folder, message_uid, - "part_id", G_TYPE_STRING, part->id, + "part_id", G_TYPE_STRING, e_mail_part_get_id (part), "mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_RAW, "formatter_default_charset", G_TYPE_STRING, default_charset, "formatter_charset", G_TYPE_STRING, charset, @@ -131,7 +131,8 @@ emfe_vcard_inline_format (EMailFormatterExtension *extension, } str = g_strdup_printf ( - "<div id=\"%s\">", part->id); + "<div id=\"%s\">", + e_mail_part_get_id (part)); camel_stream_write_string (stream, str, cancellable, NULL); g_free (str); @@ -161,8 +162,9 @@ emfe_vcard_inline_format (EMailFormatterExtension *extension, "<iframe width=\"100%%\" height=\"auto\" frameborder=\"0\"" "src=\"%s\" name=\"%s\"></iframe>" "</div>", - part->id, access_key, html_label, - uri, part->id); + e_mail_part_get_id (part), + access_key, html_label, uri, + e_mail_part_get_id (part)); camel_stream_write_string (stream, str, cancellable, NULL); g_free (str); g_free (html_label); |