aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-format-html.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b1b8932f2f..de34ac9b31 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,10 @@
2004-01-15 Not Zed <NotZed@Ximian.com>
+ ** See bug #52891.
+
+ * em-format-html.c (em_format_html_get_type): protect against http
+ cache not being able to be created.
+
** See bug #52878.
* em-folder-view.c (emfv_finalise): unhook message_changed too.
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 44afe282d8..482b0191d5 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -231,8 +231,10 @@ em_format_html_get_type(void)
path = alloca(strlen(base_directory)+16);
sprintf(path, "%s/cache", base_directory);
emfh_http_cache = camel_data_cache_new(path, 0, NULL);
- camel_data_cache_set_expire_age(emfh_http_cache, 24*60*60);
- camel_data_cache_set_expire_access(emfh_http_cache, 2*60*60);
+ if (emfh_http_cache) {
+ camel_data_cache_set_expire_age(emfh_http_cache, 24*60*60);
+ camel_data_cache_set_expire_access(emfh_http_cache, 2*60*60);
+ }
}
return type;