From 1490b52a6b96b6a69a0c4fe9e0515dc717425128 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 22 Mar 2012 09:34:34 +0000 Subject: NetSurf options rework (a=vince r=daniels,jmb) svn path=/trunk/netsurf/; revision=13548 --- monkey/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'monkey/main.c') diff --git a/monkey/main.c b/monkey/main.c index d1507f6b4..45be754e1 100644 --- a/monkey/main.c +++ b/monkey/main.c @@ -21,7 +21,7 @@ #include #include "monkey/filetype.h" -#include "monkey/options.h" +#include "desktop/options.h" #include "monkey/poll.h" #include "monkey/dispatch.h" #include "monkey/browser.h" @@ -57,11 +57,11 @@ nsmonkey_init_resource(const char *resource_path) void gui_quit(void) { - urldb_save_cookies(option_cookie_jar); - urldb_save(option_url_file); + urldb_save_cookies(nsoption_charp(cookie_jar)); + urldb_save(nsoption_charp(url_file)); sslcert_cleanup(); - free(option_cookie_file); - free(option_cookie_jar); + free(nsoption_charp(cookie_file)); + free(nsoption_charp(cookie_jar)); gtk_fetch_filetype_fin(); } @@ -117,8 +117,8 @@ main(int argc, char **argv) filepath_sfinddef(respaths, buf, "mime.types", "/etc/"); gtk_fetch_filetype_init(buf); - urldb_load(option_url_file); - urldb_load_cookies(option_cookie_file); + urldb_load(nsoption_charp(url_file)); + urldb_load_cookies(nsoption_charp(cookie_file)); sslcert_init("content.png"); -- cgit v1.2.3