aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-format-html-display.c2
-rw-r--r--mail/em-format-html.c3
3 files changed, 8 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 70e2fd9211..bbbabf73d8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-06 Paul Bolle <pebolle@tiscali.nl>
+
+ ** Fix for bug #546668
+
+ * em-format-html.c: Drop a (pointless) define used only once.
+ * em-format-html-display.c: Drop one unused define.
+
2008-08-07 Matthew Barnes <mbarnes@redhat.com>
* em-format.c (emf_format_secure):
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index c2329c08bf..36b7e74cf6 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -100,8 +100,6 @@
#define d(x)
-#define EFHD_TABLE_OPEN "<table>"
-
struct _EMFormatHTMLDisplayPrivate {
/* For the interactive search dialogue */
/* TODO: Should this be more subtle, like the mozilla one? */
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index f2c0a102b8..bb2d176b6e 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -84,7 +84,6 @@
#define d(x)
-#define EFH_TABLE_OPEN "<table>"
#define EFM_MESSAGE_START_ANAME "evolution#message#start"
#define EFH_MESSAGE_START "<A name=\"" EFM_MESSAGE_START_ANAME "\"></A>"
@@ -2101,7 +2100,7 @@ static void efh_format_source(EMFormat *emf, CamelStream *stream, CamelMimePart
camel_stream_filter_add(filtered_stream, html_filter);
camel_object_unref(html_filter);
- camel_stream_write_string((CamelStream *)stream, EFH_TABLE_OPEN "<tr><td><tt>");
+ camel_stream_write_string((CamelStream *)stream, "<table><tr><td><tt>");
em_format_format_text(emf, (CamelStream *)filtered_stream, dw);
camel_object_unref(filtered_stream);