summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amiga/gui.c2
-rw-r--r--atari/gui.c2
-rw-r--r--beos/gui.cpp4
-rw-r--r--cocoa/NetsurfApp.m2
-rw-r--r--desktop/netsurf.c5
-rw-r--r--desktop/netsurf.h2
-rw-r--r--framebuffer/gui.c2
-rw-r--r--gtk/gui.c2
-rw-r--r--monkey/main.c2
-rw-r--r--riscos/gui.c2
-rw-r--r--windows/main.c2
11 files changed, 13 insertions, 14 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index ddca092b2..e43bca597 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -5294,7 +5294,7 @@ int main(int argc, char** argv)
if (ami_locate_resource(messages, "Messages") == false)
die("Cannot open Messages file");
- ret = netsurf_init(messages);
+ ret = netsurf_init(messages, NULL);
if (ret != NSERROR_OK) {
die("NetSurf failed to initialise");
}
diff --git a/atari/gui.c b/atari/gui.c
index e5f5770ba..98871f084 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -1126,7 +1126,7 @@ int main(int argc, char** argv)
/* common initialisation */
LOG(("Initialising core..."));
- ret = netsurf_init(messages);
+ ret = netsurf_init(messages, NULL);
if (ret != NSERROR_OK) {
die("NetSurf failed to initialise");
}
diff --git a/beos/gui.cpp b/beos/gui.cpp
index 4077a8580..56d5bfe99 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -1062,7 +1062,7 @@ int main(int argc, char** argv)
/* common initialisation */
BPath messages = get_messages_path();
- ret = netsurf_init(messages.Path());
+ ret = netsurf_init(messages.Path(), NULL);
if (ret != NSERROR_OK) {
die("NetSurf failed to initialise");
}
@@ -1115,7 +1115,7 @@ int gui_init_replicant(int argc, char** argv)
/* common initialisation */
BPath messages = get_messages_path();
- ret = netsurf_init(messages.Path());
+ ret = netsurf_init(messages.Path(), NULL);
if (ret != NSERROR_OK) {
// FIXME: must not die when in replicant!
die("NetSurf failed to initialise");
diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m
index 3a9572309..f9cc98885 100644
--- a/cocoa/NetsurfApp.m
+++ b/cocoa/NetsurfApp.m
@@ -217,7 +217,7 @@ int main( int argc, char **argv )
nsoption_commandline(&argc, argv, NULL);
/* common initialisation */
- error = netsurf_init(messages);
+ error = netsurf_init(messages, NULL);
if (error != NSERROR_OK) {
die("NetSurf failed to initialise");
}
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 18ce1264f..e82233a01 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -128,7 +128,7 @@ nserror netsurf_register(struct netsurf_table *table)
}
/* exported interface documented in desktop/netsurf.h */
-nserror netsurf_init(const char *messages)
+nserror netsurf_init(const char *messages, const char *store_path)
{
nserror ret;
struct utsname utsname;
@@ -197,8 +197,7 @@ nserror netsurf_init(const char *messages)
hlcache_parameters.llcache.store.hysteresis = (hlcache_parameters.llcache.store.limit * 20) / 100;;
/* set the path to the backing store */
- /** \todo set the backing store path properly */
- hlcache_parameters.llcache.store.path = "/tmp/ns";
+ hlcache_parameters.llcache.store.path = store_path;
/* image handler bitmap cache */
ret = image_cache_init(&image_cache_parameters);
diff --git a/desktop/netsurf.h b/desktop/netsurf.h
index 60ec57845..6c6a22a86 100644
--- a/desktop/netsurf.h
+++ b/desktop/netsurf.h
@@ -43,7 +43,7 @@ nserror netsurf_register(struct netsurf_table *table);
* @param messages path to translation mesage file.
* @return NSERROR_OK on success or error code on faliure.
*/
-nserror netsurf_init(const char *messages);
+nserror netsurf_init(const char *messages, const char *store_path);
/**
* Run event loop.
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index a3c4d9c30..251326dc2 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -1837,7 +1837,7 @@ main(int argc, char** argv)
/* common initialisation */
messages = filepath_find(respaths, "Messages");
- ret = netsurf_init(messages);
+ ret = netsurf_init(messages, NULL);
free(messages);
if (ret != NSERROR_OK) {
die("NetSurf failed to initialise");
diff --git a/gtk/gui.c b/gtk/gui.c
index cde07bb7b..c835a1882 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -1211,7 +1211,7 @@ int main(int argc, char** argv)
messages = filepath_find(respaths, "Messages");
/* core initialisation */
- ret = netsurf_init(messages);
+ ret = netsurf_init(messages, NULL);
free(messages);
if (ret != NSERROR_OK) {
fprintf(stderr, "NetSurf core failed to initialise (%s)\n",
diff --git a/monkey/main.c b/monkey/main.c
index fe703f226..10ec1baf8 100644
--- a/monkey/main.c
+++ b/monkey/main.c
@@ -155,7 +155,7 @@ main(int argc, char **argv)
/* common initialisation */
messages = filepath_find(respaths, "Messages");
- ret = netsurf_init(messages);
+ ret = netsurf_init(messages, NULL);
free(messages);
if (ret != NSERROR_OK) {
die("NetSurf failed to initialise");
diff --git a/riscos/gui.c b/riscos/gui.c
index ee450fa65..9ee56e685 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -2542,7 +2542,7 @@ int main(int argc, char** argv)
}
/* common initialisation */
- ret = netsurf_init(path);
+ ret = netsurf_init(path, NULL);
if (ret != NSERROR_OK) {
die("NetSurf failed to initialise");
}
diff --git a/windows/main.c b/windows/main.c
index 7cd6339d7..7ad3d8550 100644
--- a/windows/main.c
+++ b/windows/main.c
@@ -164,7 +164,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd)
/* common initialisation */
messages = filepath_find(respaths, "messages");
- ret = netsurf_init(messages);
+ ret = netsurf_init(messages, NULL);
free(messages);
if (ret != NSERROR_OK) {
free(options_file_location);