Cleaned up header inclusions and added plenty of forward declarations.

2004-03-31  Not Zed  <NotZed@Ximian.com>

        * *.[ch]: Cleaned up header inclusions and added plenty of forward
        declarations.  Sped up complete re-compilation by upto 20%.

        ** See bug #55950.

        * em-utils.c (em_utils_in_addressbook): utility for checking if an
        email address is in the addressbook.  I can't tell if it works
        'cause it crashes eds.

        * em-format-html.c (emfh_gethttp): handle addressbook checking.

2004-03-30  Not Zed  <NotZed@Ximian.com>

        * mail-config.h: clean up the headers and use some forward decl's
        instead.

        * em-format-html.c (em_format_html_set_load_http): change state to
        an int 'style' instead.

        * em-folder-view.c (emfv_setting_notify): set the format load http
        option to the config value directly.

        ** See bug #56147.

        * message-list.c (clear_info): set the node data to NULL when we
        unref its data.
        (ml_get_save_id): use a different test for the root node, and
        return NULL if we don't have any data on the node (because we're
        cleaing it).

        ** See bug #54962.

        * em-folder-tree.c (emft_popup_new_folder_response): put back the
        old hack to open the vfolder editor if you try to create a folder
        under vfolders.

        ** See bug #55940.

        * mail-autofilter.c (mail_filter_rename_uri): map the uri to an
        email uri before passing to filter code.
        (mail_filter_delete_uri): same here.

svn path=/trunk/; revision=25261

1 files changed, 8 insertions, 6 deletions

diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 1501cf0ee6..9dbf044262 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -60,10 +60,10 @@
 #include <camel/camel-data-cache.h>
 #include <camel/camel-file-utils.h>
 
-
 #include <e-util/e-msgport.h>
 
 #include "mail-component.h"
+#include "mail-config.h"
 #include "mail-mt.h"
 
 #include "em-format-html.h"
@@ -261,10 +261,10 @@ void em_format_html_load_http(EMFormatHTML *emfh)
 }
 
 void
-em_format_html_set_load_http(EMFormatHTML *emfh, int state)
+em_format_html_set_load_http(EMFormatHTML *emfh, int style)
 {
-	if (emfh->load_http ^ state) {
-		emfh->load_http = state;
+	if (emfh->load_http != style) {
+		emfh->load_http = style;
 		em_format_redraw((EMFormat *)emfh);
 	}
 }
@@ -439,11 +439,13 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, int cancelled)
 	if (instream == NULL) {
 		char *proxy;
 
-		if (!job->format->load_http_now) {
+		if ((job->format->load_http != MAIL_CONFIG_HTTP_ALWAYS && !job->format->load_http_now)
+		    || job->format->load_http == MAIL_CONFIG_HTTP_NEVER
+		    || (job->format->load_http == MAIL_CONFIG_HTTP_SOMETIMES
+			&& !em_utils_in_addressbook(camel_mime_message_get_from(job->format->format.message)))) {
 			/* TODO: Ideally we would put the http requests into another queue and only send them out
 			   if the user selects 'load images', when they do.  The problem is how to maintain this
 			   state with multiple renderings, and how to adjust the thread dispatch/setup routine to handle it */
-			/* FIXME: Need to handle 'load if sender in addressbook' case too */
 			camel_url_free(url);
 			goto done;
 		}