diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 4 | ||||
| -rw-r--r-- | mail/em-format-html.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 8212ec62f2..3a73664c11 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +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. + 2008-11-12 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #524377 diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 56f6ba6bc2..e7ae0d637d 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -3114,7 +3114,6 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold 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 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold 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); diff --git a/mail/em-format-html.c b/mail/em-format-html.c index a4fb9ddceb..d6f52275c8 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1923,7 +1923,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) /* 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); |