Split "Other" page into three pages, Display, Composer, and PGP. Add HTML

	* mail-config.glade: Split "Other" page into three pages, Display,
	Composer, and PGP. Add HTML image stuff on the Display page and
	default forward style on the Composer page.

	* mail-config.c (mail_config_get_default_forward_style,
	mail_config_set_default_forward_style): User-specified default
	style for forwarding messages.
	(config_read, mail_config_write_on_exit): Deal with forward style.

	* mail-accounts.c: Handle HTML image display options and default
	forward style.

	* mail-callbacks.c (forward): New. Forward in the user-selected
	default style.
	(forward_inline, forward_quoted): Simplify these some. Remove the
	fallback to forward attached when forwarding multiple messages: it
	should just forward the multiple messages inline or quoted in
	those cases. (Which it doesn't yet, but that's a bug.)

	* folder-browser.c (context_menu): Remove "Forward inline" and
	make "Forward" call forward() rather than forward_attached().

	* folder-browser-factory.c: Update command/menu/toolbar/pixmap
	gunk for the "MessageForwardAttached" vs "MessageForward" split.

	* mail-session.c (mail_session_get_type):
	* mail-format.c (format_mime_part):
	* mail-account-gui.c (setup_service): Fix warnings.

svn path=/trunk/; revision=9792

1 files changed, 27 insertions, 0 deletions

diff --git a/mail/mail-config.c b/mail/mail-config.c
index 3a76d57805..bead41108f 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -67,6 +67,7 @@ typedef struct {
 	CamelPgpType pgp_type;
 
 	MailConfigHTTPMode http_mode;
+	MailConfigForwardStyle default_forward_style;
 } MailConfig;
 
 static const char GCONFPATH[] = "/apps/Evolution/Mail";
@@ -460,6 +461,14 @@ config_read (void)
 		config->http_mode = MAIL_CONFIG_HTTP_NEVER;
 	g_free (str);
 	
+	/* Forwarding */
+	str = g_strdup_printf ("=%s/config/Mail=/Format/defaul_forward_style",
+			       evolution_dir);
+	config->default_forward_style = gnome_config_get_int_with_default (str, &def);
+	if (def)
+		config->default_forward_style = MAIL_CONFIG_FORWARD_ATTACHED;
+	g_free (str);
+	
 	gnome_config_sync ();
 }
 
@@ -642,6 +651,12 @@ mail_config_write_on_exit (void)
 	gnome_config_set_int (str, config->http_mode);
 	g_free (str);
 
+	/* Forwarding */
+	str = g_strdup_printf ("=%s/config/Mail=/Format/default_forward_style", 
+			       evolution_dir);
+	gnome_config_set_int (str, config->default_forward_style);
+	g_free (str);
+
 	/* Passwords */
 	gnome_config_private_clean_section ("/Evolution/Passwords");
 	sources = mail_config_get_sources ();
@@ -886,6 +901,18 @@ mail_config_set_http_mode (MailConfigHTTPMode mode)
 	config->http_mode = mode;
 }
 
+MailConfigForwardStyle
+mail_config_get_default_forward_style (void)
+{
+	return config->default_forward_style;
+}
+
+void
+mail_config_set_default_forward_style (MailConfigForwardStyle style)
+{
+	config->default_forward_style = style;
+}
+
 const MailConfigAccount *
 mail_config_get_default_account (void)
 {