evolution r36331 - trunk/mail

[psankar svn gnome org]

Author: psankar
Date: Mon Sep 15 08:21:02 2008
New Revision: 36331
URL: http://svn.gnome.org/viewvc/evolution?rev=36331&view=rev

Log:
** Fix for bug #539536

* em-format.c: (struct default_headers):
* em-format-html.c: (efh_format_headers):
* em-format-html.c: (default_headers):
Add "Face" header to default headers and allow it to be hidden.

Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-format-html.c
   trunk/mail/em-format.c
   trunk/mail/em-mailer-prefs.c

Modified: trunk/mail/em-format-html.c
==============================================================================
--- trunk/mail/em-format-html.c	(original)
+++ trunk/mail/em-format-html.c	Mon Sep 15 08:21:02 2008
@@ -1931,10 +1931,11 @@
 	} else {
 		int mailer_shown = FALSE;
 		while (h->next) {
-			int mailer;
+			int mailer, face;
 
 			header = ((CamelMimePart *)part)->headers;
 			mailer = !g_ascii_strcasecmp (h->name, "X-Evolution-Mailer");
+			face = !g_ascii_strcasecmp (h->name, "Face");
 
 			while (header) {
 				if (emf->show_photo && !photo_name && !g_ascii_strcasecmp (header->name, "From"))
@@ -1967,7 +1968,7 @@
 					efh_format_header (emf, stream, part, &xmailer, h->flags, charset);
 					if (strstr(use_header->value, "Evolution"))
 						have_icon = TRUE;
-				} else if (!g_ascii_strcasecmp (header->name, "Face") && !face_decoded) {
+				} else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) {
 					char *cp = header->value;
 					
 					/* Skip over spaces */
@@ -1978,7 +1979,8 @@
 					face_header_value = g_realloc (face_header_value, face_header_len + 1);
 					face_header_value[face_header_len] = 0;
 					face_decoded = TRUE;
-				} else if (!g_ascii_strcasecmp (header->name, h->name)) {
+				/* Showing an encoded "Face" header makes little sense */
+				} else if (!g_ascii_strcasecmp (header->name, h->name) && !face) {
 					efh_format_header(emf, stream, part, header, h->flags, charset);
 				}
 

Modified: trunk/mail/em-format.c
==============================================================================
--- trunk/mail/em-format.c	(original)
+++ trunk/mail/em-format.c	Mon Sep 15 08:21:02 2008
@@ -889,6 +889,7 @@
 	{ N_("Subject"), EM_FORMAT_HEADER_BOLD },
 	{ N_("Date"), EM_FORMAT_HEADER_BOLD },
 	{ N_("Newsgroups"), EM_FORMAT_HEADER_BOLD },
+	{ N_("Face"), 0 },
 };
 
 /**

Modified: trunk/mail/em-mailer-prefs.c
==============================================================================
--- trunk/mail/em-mailer-prefs.c	(original)
+++ trunk/mail/em-mailer-prefs.c	Mon Sep 15 08:21:02 2008
@@ -80,6 +80,7 @@
 	N_("Subject"),
 	N_("Date"),
 	N_("Newsgroups"),
+	N_("Face"),
 	"x-evolution-mailer", /* DO NOT translate */
 };