diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
| commit | 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 (patch) | |
| tree | 828acaa7b76aa12a490a3238b0ec4a7086b8be16 /mail/em-folder-view.c | |
| parent | 076b7c45131482b87d18963d34d035435491ee8d (diff) | |
| download | gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.gz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.bz2 gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.lz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.xz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.zst gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.zip | |
Merge revisions 36737:36810 from trunk.
svn path=/branches/kill-bonobo/; revision=36811
Diffstat (limited to 'mail/em-folder-view.c')
| -rw-r--r-- | mail/em-folder-view.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 77c74125d6..6dfe8735d6 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -2901,7 +2901,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); @@ -2913,15 +2912,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); |