[project @ 2004-06-21 15:09:58 by bursa]

Merge memory cache into content module.

svn path=/import/netsurf/; revision=986

4 files changed, 9 insertions, 4 deletions

diff --git a/desktop/browser.h b/desktop/browser.h
index 9ebcd11fd..34f759102 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -21,6 +21,7 @@
 
 struct box;
 struct history;
+struct form_successful_control;
 
 /** Browser window data. */
 struct browser_window
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index d04d35621..55020354f 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -11,7 +11,6 @@
 #include <stdlib.h>
 #include <sys/utsname.h>
 #include "netsurf/utils/config.h"
-#include "netsurf/content/cache.h"
 #include "netsurf/content/fetch.h"
 #include "netsurf/content/fetchcache.h"
 #include "netsurf/desktop/options.h"
@@ -72,7 +71,6 @@ void netsurf_init(int argc, char** argv)
 	gui_init(argc, argv);
 	setlocale(LC_ALL, "");
 	fetch_init();
-	cache_init();
 	fetchcache_init();
 	url_init();
 }
@@ -96,7 +94,6 @@ void netsurf_poll(void)
 
 void netsurf_exit(void)
 {
-	cache_quit();
 	fetch_quit();
 	gui_quit();
 }
diff --git a/desktop/options.c b/desktop/options.c
index 1748fc6b1..6b8975f5d 100644
--- a/desktop/options.c
+++ b/desktop/options.c
@@ -41,8 +41,10 @@ int option_font_size = 100;
 int option_font_min_size = 70;
 /** Accept-Language header. */
 char *option_accept_language = 0;
-/** Strict verification of SSL sertificates */
+/** Enable verification of SSL certificates. */
 bool option_ssl_verify_certificates = true;
+/** Preferred maximum size of memory cache / bytes. */
+int option_memory_cache_size = 2 * 1024 * 1024;
 
 EXTRA_OPTION_DEFINE
 
@@ -59,6 +61,7 @@ struct {
 	{ "font_min_size",   OPTION_INTEGER, &option_font_min_size },
 	{ "accept_language", OPTION_STRING,  &option_accept_language },
 	{ "ssl_verify_certificates", OPTION_BOOL, &option_ssl_verify_certificates },
+	{ "memory_cache_size", OPTION_STRING, &option_memory_cache_size },
 	EXTRA_OPTION_TABLE
 };
 
@@ -133,6 +136,9 @@ void options_read(const char *path)
 		option_font_min_size = 10;
 	if (500 < option_font_min_size)
 		option_font_min_size = 500;
+
+	if (option_memory_cache_size < 0)
+		option_memory_cache_size = 0;
 }
 
 
diff --git a/desktop/options.h b/desktop/options.h
index efec32f33..a4f0de038 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -31,6 +31,7 @@ extern int option_font_size;
 extern int option_font_min_size;
 extern char *option_accept_language;
 extern bool option_ssl_verify_certificates;
+extern int option_memory_cache_size;
 
 void options_read(const char *path);
 void options_write(const char *path);