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, 17 insertions, 10 deletions

diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 6e84a5061a..5469a2d782 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -382,19 +382,26 @@ folder_browser_toggle_hide_deleted (BonoboUIComponent           *component,
 }
 
 void
-folder_browser_toggle_view_source (BonoboUIComponent           *component,
-				   const char                  *path,
-				   Bonobo_UIComponent_EventType type,
-				   const char                  *state,
-				   gpointer                     user_data)
+folder_browser_set_message_display_style (BonoboUIComponent           *component,
+					  const char                  *path,
+					  Bonobo_UIComponent_EventType type,
+					  const char                  *state,
+					  gpointer                     user_data)
 {
+	extern char *message_display_styles[];
 	FolderBrowser *fb = user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
+	int i;
+
+	if (type != Bonobo_UIComponent_STATE_CHANGED || atoi(state) == 0)
 		return;
-	
-	mail_config_set_view_source (atoi (state));
-	mail_display_redisplay (fb->mail_display, TRUE);
+
+	for (i = 0; i < MAIL_CONFIG_DISPLAY_MAX; i++) {
+		if (strstr (message_display_styles[i], path)) {
+			mail_config_set_message_display_style (i);
+			mail_display_redisplay (fb->mail_display, TRUE);
+			return;
+		}
+	}
 }
 
 void