From 35dacc36716bdac66bc2673a6725083dc265d310 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 23 May 2013 11:50:57 +0100 Subject: move the logging initialisation out to be call by frontends This allows each frontend to pass a distinct callback to configure the output file stream appropriately for their use. --- gtk/gui.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'gtk') diff --git a/gtk/gui.c b/gtk/gui.c index 59847214b..832d79e6e 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -514,6 +514,17 @@ static void nsgtk_check_homedir(void) } } +/** + * Ensures output logging stream is correctly configured + */ +static bool nslog_stream_configure(FILE *fptr) +{ + /* set log stream to be non-buffering */ + setbuf(fptr, NULL); + + return true; +} + /** * Main entry point from OS. */ @@ -529,12 +540,14 @@ int main(int argc, char** argv) gtk_init(&argc, &argv); - /* set standard error to be non-buffering */ - setbuf(stderr, NULL); - options = filepath_find(respaths, "Choices"); messages = filepath_find(respaths, "Messages"); + /* initialise logging. Not fatal if it fails but not much we + * can do about it either. + */ + nslog_init(nslog_stream_configure, &argc, argv); + netsurf_init(&argc, &argv, options, messages); free(messages); -- cgit v1.2.3