From bb2092ac42761ca2f8b53644ac67b2d328bda1a1 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@src.gnome.org>
Date: Sun, 29 Jul 2007 09:52:07 +0000
Subject:         ** Fix for bug #459030

svn path=/trunk/; revision=33881
---
 mail/ChangeLog        |  6 ++++++
 mail/em-format-html.c | 18 +++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index c91df8b199..075849b1bf 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #459030
+
+	* em-format-html.c (efh_format_address): Workaround broken N_ strings.
+
 2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* em-folder-browser.c: (emfb_list_key_press): Fix a build break with
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index f2eb568595..d554b1e288 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1519,9 +1519,9 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres
 	int limit = mail_config_get_address_count ();
 
 	if (field ) {
-		if ((!strcmp (field, i18n_hdrs[2]) && !(efh->header_wrap_flags & EM_FORMAT_HTML_HEADER_TO))
-		    || (!strcmp (field, i18n_hdrs[3]) && !(efh->header_wrap_flags & EM_FORMAT_HTML_HEADER_CC))
-		    || (!strcmp (field, i18n_hdrs[4]) && !(efh->header_wrap_flags & EM_FORMAT_HTML_HEADER_BCC)))
+		if ((!strcmp (field, _("To")) && !(efh->header_wrap_flags & EM_FORMAT_HTML_HEADER_TO))
+		    || (!strcmp (field, _("Cc")) && !(efh->header_wrap_flags & EM_FORMAT_HTML_HEADER_CC))
+		    || (!strcmp (field, _("Bcc")) && !(efh->header_wrap_flags & EM_FORMAT_HTML_HEADER_BCC)))
 		    wrap = TRUE;
 	}
 	
@@ -1577,20 +1577,20 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres
 		/* Let us add a '...' if we have more addresses */
 		if (limit > 0 && wrap && a && (i>(limit-1))) {
 			
-			if (!strcmp (field, i18n_hdrs[2])) {
+			if (!strcmp (field, _("To"))) {
 				
 				g_string_append (out, "<a href=\"##TO##\">...</a>");
 				str = g_strdup_printf ("<a href=\"##TO##\"><img src=\"%s/plus.png\" /></a>  ", EVOLUTION_ICONSDIR);
 				
 				return str;
 			}
-			else if (!strcmp (field, i18n_hdrs[3])) {
+			else if (!strcmp (field, _("Cc"))) {
 				g_string_append (out, "<a href=\"##CC##\">...</a>");
 				str = g_strdup_printf ("<a href=\"##CC##\"><img src=\"%s/plus.png\" /></a>  ", EVOLUTION_ICONSDIR);
 
 				return str;
 			}
-			else if (!strcmp (field, i18n_hdrs[4])) {
+			else if (!strcmp (field, _("Bcc"))) {
 				g_string_append (out, "<a href=\"##BCC##\">...</a>");
 				str = g_strdup_printf ("<a href=\"##BCC##\"><img src=\"%s/plus.png\" /></a>  ", EVOLUTION_ICONSDIR);
 
@@ -1603,13 +1603,13 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres
 	if (limit > 0 && i>(limit)) {
 
 		
-		if (!strcmp (field, i18n_hdrs[2])) {
+		if (!strcmp (field, _("To"))) {
 			str = g_strdup_printf ("<a href=\"##TO##\"><img src=\"%s/minus.png\" /></a>  ", EVOLUTION_ICONSDIR);
 		}
-		else if (!strcmp (field, i18n_hdrs[3])) {
+		else if (!strcmp (field, _("Cc"))) {
 			str = g_strdup_printf ("<a href=\"##CC##\"><img src=\"%s/minus.png\" /></a>  ", EVOLUTION_ICONSDIR);
 		}
-		else if (!strcmp (field, i18n_hdrs[4])) {
+		else if (!strcmp (field, _("Bcc"))) {
 			str = g_strdup_printf ("<a href=\"##BCC##\"><img src=\"%s/minus.png\" /></a>  ", EVOLUTION_ICONSDIR);
 		}
 	}
-- 
cgit v1.2.3