evolution r36780 - trunk/mail

[abharath svn gnome org]

Author: abharath
Date: Thu Nov 13 07:50:33 2008
New Revision: 36780
URL: http://svn.gnome.org/viewvc/evolution?rev=36780&view=rev

Log:
2008-11-13  Bharath Acharya  <abharath novell com>

       * em-folder-view.c: (emfv_setting_notify):
       * em-format-html.c: (efh_format_headers): Do not display the default 
       headers when all the headers are disabled in Mail preferences.


Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-folder-view.c
   trunk/mail/em-format-html.c

Modified: trunk/mail/em-folder-view.c
==============================================================================
--- trunk/mail/em-folder-view.c	(original)
+++ trunk/mail/em-folder-view.c	Thu Nov 13 07:50:33 2008
@@ -3114,7 +3114,6 @@
 	case EMFV_HEADERS: {
 		GSList *header_config_list, *p;
 		EMFormat *emf = (EMFormat *)emfv->preview;
-		int added_headers = 0;
 
 		header_config_list = gconf_client_get_list(gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL);
       		em_format_clear_headers((EMFormat *)emfv->preview);
@@ -3126,15 +3125,12 @@
 			h = em_mailer_prefs_header_from_xml(xml);
 			if (h && h->enabled) {
 				em_format_add_header(emf, h->name, EM_FORMAT_HEADER_BOLD);
-				added_headers++;
 			}
 			em_mailer_prefs_header_free(h);
 			p = g_slist_next(p);
 		}
 		g_slist_foreach(header_config_list, (GFunc) g_free, NULL);
 		g_slist_free(header_config_list);
-		if (added_headers == 0)
-			em_format_default_headers(emf);
 		/* force a redraw */
 		if (emf->message)
 			em_format_redraw(emf);

Modified: trunk/mail/em-format-html.c
==============================================================================
--- trunk/mail/em-format-html.c	(original)
+++ trunk/mail/em-format-html.c	Thu Nov 13 07:50:33 2008
@@ -1923,7 +1923,7 @@
 
 	/* dump selected headers */
 	h = (EMFormatHeader *)emf->header_list.head;
-	if (h->next == NULL || emf->mode == EM_FORMAT_ALLHEADERS) {
+	if (emf->mode == EM_FORMAT_ALLHEADERS) {
 		header = ((CamelMimePart *)part)->headers;
 		while (header) {
 			efh_format_header(emf, stream, part, header, EM_FORMAT_HTML_HEADER_NOCOLUMNS, charset);