Load http images if the user has force-loaded images too.

	* mail-display.c (on_url_requested): Load http images if the user
	has force-loaded images too.
	(mail_display_redisplay): Update for normal/headers/source changes.
	(mail_display_load_images): New. Force HTTP image loading for the
	current message.

	* mail-config.c (mail_config_get_message_display_style,
	mail_config_set_message_display_style): Updated and renamed from
	mail_config_{get,set}_view_source

	* mail-callbacks.c (load_images): New.

	* folder-browser.c (folder_browser_set_message_display_style):
	Renamed and updated from folder_browser_toggle_view_source.

	* folder-browser-factory.c (verbs): Add ViewLoadImages.
	(control_activate): Update for normal/headers/source change to
	radio group.

svn path=/trunk/; revision=9820

1 files changed, 11 insertions, 5 deletions

diff --git a/mail/mail-config.h b/mail/mail-config.h
index 46b6e17035..cba1675838 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -61,14 +61,20 @@ typedef struct {
 
 typedef enum {
 	MAIL_CONFIG_HTTP_NEVER, MAIL_CONFIG_HTTP_SOMETIMES,
-	MAIL_CONFIG_HTTP_ALWAYS,
+	MAIL_CONFIG_HTTP_ALWAYS
 } MailConfigHTTPMode;
 
 typedef enum {
 	MAIL_CONFIG_FORWARD_ATTACHED, MAIL_CONFIG_FORWARD_INLINE,
-	MAIL_CONFIG_FORWARD_QUOTED,
+	MAIL_CONFIG_FORWARD_QUOTED
 } MailConfigForwardStyle;
 
+typedef enum {
+	MAIL_CONFIG_DISPLAY_NORMAL, MAIL_CONFIG_DISPLAY_FULL_HEADERS,
+	MAIL_CONFIG_DISPLAY_SOURCE,
+	MAIL_CONFIG_DISPLAY_MAX
+} MailConfigDisplayStyle;
+
 /* Identities */
 MailConfigIdentity *identity_copy (const MailConfigIdentity *id);
 void                identity_destroy (MailConfigIdentity *id);
@@ -95,9 +101,6 @@ gboolean mail_config_is_configured            (void);
 gboolean mail_config_get_thread_list          (void);
 void     mail_config_set_thread_list          (gboolean value);
 
-gboolean mail_config_get_view_source          (void);
-void     mail_config_set_view_source          (gboolean value);
-
 gboolean mail_config_get_hide_deleted          (void);
 void     mail_config_set_hide_deleted          (gboolean value);
 
@@ -131,6 +134,9 @@ void               mail_config_set_http_mode (MailConfigHTTPMode);
 MailConfigForwardStyle mail_config_get_default_forward_style (void);
 void                   mail_config_set_default_forward_style (MailConfigForwardStyle);
 
+MailConfigDisplayStyle mail_config_get_message_display_style (void);
+void                   mail_config_set_message_display_style (MailConfigDisplayStyle);
+
 const MailConfigAccount  *mail_config_get_default_account       (void);
 const MailConfigAccount  *mail_config_get_account_by_name       (const char *account_name);
 const MailConfigAccount  *mail_config_get_account_by_source_url (const char *url);