From 53996fb55905d1a25df383b4ce12e64c572b58db Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Mon, 16 Jul 2001 18:32:10 +0000 Subject: Use our own display_style member instead of the global setting. 2001-07-16 Peter Williams * mail-display.c (mail_display_redisplay): Use our own display_style member instead of the global setting. (mail_display_init): Initialize display_style. * mail-display.h: Include "mail-config.h" and add a display_style member. * mail-format.c (write_headers): Look at the MailDisplay's display_style instead of using the full_headers data. * folder-browser.c (folder_browser_set_message_display_style): Set the MailDisplay's display style as well as the global display style. (my_folder_browser_init): Don't save preference changes by default. (This is only observered wrt. the message display style but should apply to other items.) * folder-browser-factory.c (folder_browser_factory_new_control): Set this FB to save the preferences set in it. * folder-browser-ui.c (folder_browser_ui_add_message): Read our display's state instead of the global setting. svn path=/trunk/; revision=11131 --- mail/mail-display.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'mail/mail-display.c') diff --git a/mail/mail-display.c b/mail/mail-display.c index a7fd33dc64..2a0748eb39 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -1199,13 +1199,10 @@ mail_display_redisplay (MailDisplay *md, gboolean unscroll) mail_html_write (md->html, md->stream, "\n"); if (md->current_message) { - MailConfigDisplayStyle style = mail_config_get_message_display_style (); - if (style == MAIL_CONFIG_DISPLAY_SOURCE) + if (md->display_style == MAIL_CONFIG_DISPLAY_SOURCE) mail_format_raw_message (md->current_message, md); - else { - g_datalist_set_data (md->data, "full_headers", GINT_TO_POINTER (style == MAIL_CONFIG_DISPLAY_FULL_HEADERS)); + else mail_format_mime_message (md->current_message, md); - } } mail_html_write (md->html, md->stream, "\n"); @@ -1278,6 +1275,8 @@ mail_display_init (GtkObject *object) mail_display->data = NULL; mail_display->invisible = gtk_invisible_new (); + + mail_display->display_style = mail_config_get_message_display_style (); } static void -- cgit v1.2.3