Save the message-display style. (config_read): Read the message-display

2001-05-22  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-config.c (mail_config_write_on_exit): Save the
	message-display style.
	(config_read): Read the message-display style.

svn path=/trunk/; revision=9938

3 files changed, 23 insertions, 3 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index cfe9b1cdbc..c58dbacf03 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-22  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-config.c (mail_config_write_on_exit): Save the
+	message-display style.
+	(config_read): Read the message-display style.
+
 2001-05-22  Dan Winship  <danw@ximian.com>
 
 	* mail-display.c (on_url_requested): If http mode is
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 1560e6e602..aba9a56220 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -469,6 +469,14 @@ config_read (void)
 		config->default_forward_style = MAIL_CONFIG_FORWARD_ATTACHED;
 	g_free (str);
 	
+	/* Message Display */
+	str = g_strdup_printf ("=%s/config/Mail=/Format/message_display_style",
+			       evolution_dir);
+	config->message_display_style = gnome_config_get_int_with_default (str, &def);
+	if (def)
+		config->message_display_style = MAIL_CONFIG_DISPLAY_NORMAL;
+	g_free (str);
+	
 	gnome_config_sync ();
 }
 
@@ -656,7 +664,13 @@ mail_config_write_on_exit (void)
 			       evolution_dir);
 	gnome_config_set_int (str, config->default_forward_style);
 	g_free (str);
-
+	
+	/* Message Display */
+	str = g_strdup_printf ("=%s/config/Mail=/Format/message_display_style", 
+			       evolution_dir);
+	gnome_config_set_int (str, config->message_display_style);
+	g_free (str);
+	
 	/* Passwords */
 	gnome_config_private_clean_section ("/Evolution/Passwords");
 	sources = mail_config_get_sources ();
diff --git a/mail/mail-config.h b/mail/mail-config.h
index cba1675838..5f1b1b47b7 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -132,10 +132,10 @@ MailConfigHTTPMode mail_config_get_http_mode (void);
 void               mail_config_set_http_mode (MailConfigHTTPMode);
 
 MailConfigForwardStyle mail_config_get_default_forward_style (void);
-void                   mail_config_set_default_forward_style (MailConfigForwardStyle);
+void                   mail_config_set_default_forward_style (MailConfigForwardStyle style);
 
 MailConfigDisplayStyle mail_config_get_message_display_style (void);
-void                   mail_config_set_message_display_style (MailConfigDisplayStyle);
+void                   mail_config_set_message_display_style (MailConfigDisplayStyle style);
 
 const MailConfigAccount  *mail_config_get_default_account       (void);
 const MailConfigAccount  *mail_config_get_account_by_name       (const char *account_name);