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, 2 insertions, 8 deletions

diff --git a/mail/mail-callbacks.h b/mail/mail-callbacks.h
index a241f45b20..a800d9a04e 100644
--- a/mail/mail-callbacks.h
+++ b/mail/mail-callbacks.h
@@ -42,16 +42,10 @@ void send_receive_mail     (GtkWidget *widget, gpointer user_data);
 void compose_msg           (GtkWidget *widget, gpointer user_data);
 void send_to_url           (const char *url);
 
-enum {
-	FORWARD_INLINE,
-	FORWARD_QUOTED,
-	FORWARD_ATTACHED
-};
-
-void forward_messages      (CamelFolder *folder, GPtrArray *uids, int flag);
-void forward_inlined       (GtkWidget *widget, gpointer user_data);
+void forward_inline        (GtkWidget *widget, gpointer user_data);
 void forward_quoted        (GtkWidget *widget, gpointer user_data);
 void forward_attached      (GtkWidget *widget, gpointer user_data);
+void forward               (GtkWidget *widget, gpointer user_data);
 
 void reply_to_sender       (GtkWidget *widget, gpointer user_data);
 void reply_to_all          (GtkWidget *widget, gpointer user_data);