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/folder-browser.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'mail/folder-browser.c') diff --git a/mail/folder-browser.c b/mail/folder-browser.c index c682b850d6..05d363cdb6 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -1029,8 +1029,11 @@ folder_browser_set_message_display_style (BonoboUIComponent *component for (i = 0; i < MAIL_CONFIG_DISPLAY_MAX; i++) { if (strstr (message_display_styles[i], path)) { - mail_config_set_message_display_style (i); + fb->mail_display->display_style = i; mail_display_redisplay (fb->mail_display, TRUE); + + if (fb->pref_master) + mail_config_set_message_display_style (i); return; } } @@ -1763,7 +1766,9 @@ my_folder_browser_init (GtkObject *object) fb->view_collection = NULL; fb->view_menus = NULL; - + + fb->pref_master = FALSE; + /* * Setup parent class fields. */ -- cgit