aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBharath Acharya <abharath@novell.com>2008-11-07 12:49:40 +0800
committerBharath Acharya <abharath@src.gnome.org>2008-11-07 12:49:40 +0800
commitf0e5be67de227a5a77497396feb6317a5d3373d4 (patch)
treeb8648cbdcc7a46695c0d0aab60d36bf6cb428a9f
parent4272acb80703d2227695b40fd74e0ec906a9ef5e (diff)
downloadgsoc2013-evolution-f0e5be67de227a5a77497396feb6317a5d3373d4.tar.gz
gsoc2013-evolution-f0e5be67de227a5a77497396feb6317a5d3373d4.tar.zst
gsoc2013-evolution-f0e5be67de227a5a77497396feb6317a5d3373d4.zip
** Fix for BNC bug #437226 Proper message is missing in mail sent by
2008-11-07 Bharath Acharya <abharath@novell.com> ** Fix for BNC bug #437226 Proper message is missing in mail sent by delegatee * em-format-html.c (efh_format_headers): Regression caused by r35319. Check for the condition only after the while loop. svn path=/trunk/; revision=36750
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-format-html.c25
2 files changed, 20 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8b6af8fe12..27530290f0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-07 Bharath Acharya <abharath@novell.com>
+
+ ** Fix for BNC bug #437226
+
+ * em-format-html.c (efh_format_headers): Regression caused by r35319.
+ Check for the condition only after the while loop.
+
2008-11-05 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #559371
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 98badf5e70..a4fb9ddceb 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1895,22 +1895,23 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
g_free(name);
} else if (!g_ascii_strcasecmp (header->name, "X-Evolution-Mail-From-Delegate")) {
mail_from_delegate = TRUE;
- } else if (header_sender && header_from && mail_from_delegate) {
- camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>");
- if(gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
- camel_stream_printf (stream, "<td align=\"right\" width=\"100%%\">");
- else
- camel_stream_printf (stream, "<td align=\"left\" width=\"100%%\">");
- /* To translators: This message suggests to the receipients that the sender of the mail is
- different from the one listed in From field.
- */
- camel_stream_printf(stream, _("This message was sent by <b>%s</b> on behalf of <b>%s</b>"), header_sender, header_from);
- camel_stream_printf(stream, "</td></tr></table></td></tr>");
- break;
}
header = header->next;
}
+
+ if (header_sender && header_from && mail_from_delegate) {
+ camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>");
+ if(gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
+ camel_stream_printf (stream, "<td align=\"right\" width=\"100%%\">");
+ else
+ camel_stream_printf (stream, "<td align=\"left\" width=\"100%%\">");
+ /* To translators: This message suggests to the receipients that the sender of the mail is
+ different from the one listed in From field.
+ */
+ camel_stream_printf(stream, _("This message was sent by <b>%s</b> on behalf of <b>%s</b>"), header_sender, header_from);
+ camel_stream_printf(stream, "</td></tr></table></td></tr>");
+ }
g_free (header_sender);
g_free (header_from);