diff options
Diffstat (limited to 'frontends/windows/main.c')
| -rw-r--r-- | frontends/windows/main.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/frontends/windows/main.c b/frontends/windows/main.c index 442c71b06..a3a7c2b39 100644 --- a/frontends/windows/main.c +++ b/frontends/windows/main.c @@ -46,7 +46,7 @@ #include "windows/corewindow.h" #include "windows/ssl_cert.h" #include "windows/download.h" -#include "windows/localhistory.h" +#include "windows/local_history.h" #include "windows/window.h" #include "windows/schedule.h" #include "windows/font.h" @@ -99,7 +99,7 @@ static nserror get_config_home(char **config_home_out) *config_home_out = strdup(adPath); - LOG("using config path \"%s\"", *config_home_out); + NSLOG(netsurf, INFO, "using config path \"%s\"", *config_home_out); return NSERROR_OK; } @@ -343,15 +343,16 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) /* Locate the correct user configuration directory path */ ret = get_config_home(&nsw32_config_home); if (ret != NSERROR_OK) { - LOG("Unable to locate a configuration directory."); + NSLOG(netsurf, INFO, + "Unable to locate a configuration directory."); nsw32_config_home = NULL; } /* Initialise user options */ ret = nsw32_option_init(&argc, argv); if (ret != NSERROR_OK) { - LOG("Options failed to initialise (%s)\n", - messages_get_errorcode(ret)); + NSLOG(netsurf, INFO, "Options failed to initialise (%s)\n", + messages_get_errorcode(ret)); return 1; } @@ -365,17 +366,17 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) /* common initialisation */ ret = netsurf_init(NULL); if (ret != NSERROR_OK) { - LOG("NetSurf failed to initialise"); + NSLOG(netsurf, INFO, "NetSurf failed to initialise"); return 1; } urldb_load(nsoption_charp(url_file)); urldb_load_cookies(nsoption_charp(cookie_file)); - hotlist_init(nsoption_charp(hotlist_path)); + hotlist_init(nsoption_charp(hotlist_path), + nsoption_charp(hotlist_path)); ret = nsws_create_main_class(hInstance); ret = nsws_create_drawable_class(hInstance); - ret = nsws_create_localhistory_class(hInstance); ret = nsw32_create_corewindow_class(hInstance); ret = nsws_create_cert_verify_class(hInstance); @@ -392,7 +393,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) addr = NETSURF_HOMEPAGE; } - LOG("calling browser_window_create"); + NSLOG(netsurf, INFO, "calling browser_window_create"); ret = nsurl_create(addr, &url); if (ret == NSERROR_OK) { @@ -418,5 +419,8 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) /* finalise options */ nsoption_finalise(nsoptions, nsoptions_default); + /* finalise logging */ + nslog_finalise(); + return 0; } |