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, 15 insertions, 6 deletions

diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h
index 1d9bb65eb0..91de24e6d1 100644
--- a/mail/mail-accounts.h
+++ b/mail/mail-accounts.h
@@ -29,7 +29,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include <gtk/gtkclist.h>
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkoptionmenu.h>
 #include <gtk/gtkspinbutton.h>
 #include <libgnomeui/gnome-color-picker.h>
 #include <libgnomeui/gnome-dialog.h>
@@ -53,7 +54,8 @@ struct _MailAccountsDialog {
 	
 	const GSList *accounts;
 	gint accounts_row;
-	
+
+	/* Accounts page */
 	GtkCList *mail_accounts;
 	GtkButton *mail_add;
 	GtkButton *mail_edit;
@@ -63,17 +65,24 @@ struct _MailAccountsDialog {
 	
 	const GSList *news;
 	gint news_row;
-	
+
+	/* News page */
 	GtkCList *news_accounts;
 	GtkButton *news_add;
 	GtkButton *news_edit;
 	GtkButton *news_delete;
 	
-	/* "Other" widgets */
-	GtkCheckButton *send_html;
-	GtkCheckButton *citation_highlight;
+	/* Display page */
+	GtkToggleButton *citation_highlight;
 	GnomeColorPicker *citation_color;
 	GtkSpinButton *timeout;
+	GtkToggleButton *images_always, *images_sometimes, *images_never;
+
+	/* Composer page */
+	GtkToggleButton *send_html;
+	GtkOptionMenu *forward_style;
+
+	/* PGP page */
 	GnomeFileEntry *pgp_path;
 };