From 9d44f99d89e97302b27bcb426669d31cb27613a8 Mon Sep 17 00:00:00 2001 From: Bharath Acharya Date: Thu, 13 Nov 2008 07:50:33 +0000 Subject: Do not display the default headers when all the headers are disabled in 2008-11-13 Bharath Acharya * 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. svn path=/trunk/; revision=36780 --- mail/em-folder-view.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'mail/em-folder-view.c') 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); -- cgit v1.2.3