aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-04-02 15:32:08 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-04-02 15:32:08 +0800
commite2333fc944f7712b79286e72354ed0259545cb2d (patch)
tree1dfe675a91255106f2563a53f98b7eb454579301
parent70895bfdfda0460fbb1c78e6c060db9ea1ce0d04 (diff)
downloadgsoc2013-evolution-e2333fc944f7712b79286e72354ed0259545cb2d.tar.gz
gsoc2013-evolution-e2333fc944f7712b79286e72354ed0259545cb2d.tar.zst
gsoc2013-evolution-e2333fc944f7712b79286e72354ed0259545cb2d.zip
** See bug #56338.
2004-04-02 Not Zed <NotZed@Ximian.com> ** See bug #56338. * em-format-html.c (emfh_gethttp): fix the fugly "load http if" that doesn't work to be a fugly "load http if" that does work. (efh_format_timeout): dont set load_http_now here, its only an override now. svn path=/trunk/; revision=25296
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/em-format-html.c12
2 files changed, 15 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index e99fd3427b..51fe50a9bd 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-02 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #56338.
+
+ * em-format-html.c (emfh_gethttp): fix the fugly "load http if"
+ that doesn't work to be a fugly "load http if" that does work.
+ (efh_format_timeout): dont set load_http_now here, its only an
+ override now.
+
2004-04-01 Jeffrey Stedfast <fejj@ximian.com>
* em-migrate.c (cp_r): Report progress. "Fixes" bug #56355.
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index b6806e07fe..bdc981ed67 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -441,10 +441,12 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, int cancelled)
if (instream == NULL) {
char *proxy;
- 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)))) {
+ printf(" load http %d now=%d\n", job->format->load_http, job->format->load_http_now);
+
+ if (!(job->format->load_http_now
+ || job->format->load_http == MAIL_CONFIG_HTTP_ALWAYS
+ || (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 */
@@ -1314,8 +1316,6 @@ efh_format_timeout(struct _format_msg *m)
p->text_inline_parts = g_hash_table_new(NULL, NULL);
p->last_part = m->message;
- /* FIXME: Need to handle 'load if sender in addressbook' case too */
- efh->load_http_now = efh->load_http;
}
efh->priv->format_id = m->msg.seq;