aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-08-10 19:40:46 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-08-10 19:40:46 +0800
commitc1381b02bc61009814dbbbb842c34d094ed74add (patch)
tree27b5c29f3118ea27e504565f5720241b4318ca6b /mail
parent221c841d423c567f3bfb8b12ea039d7e932fdefa (diff)
downloadgsoc2013-evolution-c1381b02bc61009814dbbbb842c34d094ed74add.tar.gz
gsoc2013-evolution-c1381b02bc61009814dbbbb842c34d094ed74add.tar.zst
gsoc2013-evolution-c1381b02bc61009814dbbbb842c34d094ed74add.zip
EMFormat cleanups.
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-reader.c11
-rw-r--r--mail/em-format-html.c4
2 files changed, 8 insertions, 7 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index f60a3d44c0..3675b5209b 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1198,7 +1198,7 @@ action_mail_show_all_headers_cb (GtkToggleAction *action,
EMailReader *reader)
{
EMFormatHTML *formatter;
- em_format_mode_t mode;
+ EMFormatMode mode;
formatter = e_mail_reader_get_formatter (reader);
@@ -1206,9 +1206,9 @@ action_mail_show_all_headers_cb (GtkToggleAction *action,
return;
if (gtk_toggle_action_get_active (action))
- mode = EM_FORMAT_ALLHEADERS;
+ mode = EM_FORMAT_MODE_ALLHEADERS;
else
- mode = EM_FORMAT_NORMAL;
+ mode = EM_FORMAT_MODE_NORMAL;
em_format_set_mode (EM_FORMAT (formatter), mode);
}
@@ -1235,8 +1235,9 @@ action_mail_show_source_cb (GtkAction *action,
reader = E_MAIL_READER (browser);
formatter = e_mail_reader_get_formatter (reader);
- if (formatter)
- em_format_set_mode (EM_FORMAT (formatter), EM_FORMAT_SOURCE);
+ if (formatter != NULL)
+ em_format_set_mode (
+ EM_FORMAT (formatter), EM_FORMAT_MODE_SOURCE);
e_mail_reader_set_folder (reader, folder, folder_uri);
e_mail_reader_set_message (reader, uids->pdata[0]);
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index a7e4c03ab5..5818ad2a35 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -181,7 +181,7 @@ efh_format_exec (struct _format_msg *m)
/* <insert top-header stuff here> */
- if (format->mode == EM_FORMAT_SOURCE) {
+ if (format->mode == EM_FORMAT_MODE_SOURCE) {
em_format_format_source (
format, (CamelStream *) m->estream,
(CamelMimePart *) m->message);
@@ -2659,7 +2659,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
camel_stream_printf (stream, "<tr><td><table border=0 cellpadding=\"0\">\n");
/* dump selected headers */
- if (emf->mode == EM_FORMAT_ALLHEADERS) {
+ if (emf->mode == EM_FORMAT_MODE_ALLHEADERS) {
header = ((CamelMimePart *)part)->headers;
while (header) {
efh_format_header(emf, stream, part, header, EM_FORMAT_HTML_HEADER_NOCOLUMNS, charset);