diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-02-07 01:41:18 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-02-07 02:16:40 +0800 |
| commit | c5fae912d155a7e6247d92b3974a615fd17944f0 (patch) | |
| tree | 7dc2050b0df17d75490a29a46f3c81f8cfee885f /em-format/e-mail-formatter-utils.c | |
| parent | 6b3e0145df863c8f41af4e82a6ba5827a7fb767e (diff) | |
| download | gsoc2013-evolution-c5fae912d155a7e6247d92b3974a615fd17944f0.tar gsoc2013-evolution-c5fae912d155a7e6247d92b3974a615fd17944f0.tar.gz gsoc2013-evolution-c5fae912d155a7e6247d92b3974a615fd17944f0.tar.bz2 gsoc2013-evolution-c5fae912d155a7e6247d92b3974a615fd17944f0.tar.lz gsoc2013-evolution-c5fae912d155a7e6247d92b3974a615fd17944f0.tar.xz gsoc2013-evolution-c5fae912d155a7e6247d92b3974a615fd17944f0.tar.zst gsoc2013-evolution-c5fae912d155a7e6247d92b3974a615fd17944f0.zip | |
Use CamelMimeFilterToHTMLFlags enum type where appropriate.
Diffstat (limited to 'em-format/e-mail-formatter-utils.c')
| -rw-r--r-- | em-format/e-mail-formatter-utils.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/em-format/e-mail-formatter-utils.c b/em-format/e-mail-formatter-utils.c index e738d615a6..5fdb885e9a 100644 --- a/em-format/e-mail-formatter-utils.c +++ b/em-format/e-mail-formatter-utils.c @@ -59,12 +59,16 @@ e_mail_formatter_format_text_header (EMailFormatter *formatter, while (*value == ' ') value++; - if (!(flags & E_MAIL_FORMATTER_HEADER_FLAG_HTML)) + if (!(flags & E_MAIL_FORMATTER_HEADER_FLAG_HTML)) { + CamelMimeFilterToHTMLFlags text_format_flags; + + text_format_flags = + e_mail_formatter_get_text_format_flags (formatter); html = mhtml = camel_text_to_html ( - value, - e_mail_formatter_get_text_format_flags (formatter), 0); - else + value, text_format_flags, 0); + } else { html = value; + } is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; @@ -108,7 +112,7 @@ e_mail_formatter_format_address (EMailFormatter *formatter, gboolean no_links, gboolean elipsize) { - guint32 flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES; + CamelMimeFilterToHTMLFlags flags; gchar *name, *mailto, *addr; gint i = 0; gchar *str = NULL; @@ -118,6 +122,8 @@ e_mail_formatter_format_address (EMailFormatter *formatter, g_return_val_if_fail (out != NULL, NULL); g_return_val_if_fail (field != NULL, NULL); + flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES; + while (a != NULL) { if (a->name) name = camel_text_to_html (a->name, flags, 0); @@ -342,6 +348,7 @@ e_mail_formatter_format_header (EMailFormatter *formatter, flags |= E_MAIL_FORMATTER_HEADER_FLAG_BOLD; } else if (g_str_equal (name, "Date") || g_str_equal (name, "Resent-Date")) { + CamelMimeFilterToHTMLFlags text_format_flags; gint msg_offset, local_tz; time_t msg_date; struct tm local; @@ -354,9 +361,10 @@ e_mail_formatter_format_header (EMailFormatter *formatter, while (*txt == ' ' || *txt == '\t') txt++; - html = camel_text_to_html ( - txt, - e_mail_formatter_get_text_format_flags (formatter), 0); + text_format_flags = + e_mail_formatter_get_text_format_flags (formatter); + + html = camel_text_to_html (txt, text_format_flags, 0); msg_date = camel_header_decode_date (txt, &msg_offset); e_localtime_with_offset (msg_date, &local, &local_tz); |