diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-09-20 18:48:54 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-09-22 18:11:23 +0100 |
commit | 841bc170909704344373da73964ff492d078f08f (patch) | |
tree | 04db4998696c3d445b4a898ba36f52b832e0a9c6 | |
parent | 3d72c4a77281a304824f80ecbb3c47417a46d433 (diff) | |
download | netsurf-841bc170909704344373da73964ff492d078f08f.tar.gz netsurf-841bc170909704344373da73964ff492d078f08f.tar.bz2 |
move gtk execution loop to main()
-rw-r--r-- | gtk/gui.c | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -322,7 +322,7 @@ static nserror set_defaults(struct nsoption_s *defaults) /** * Initialize GTK interface. */ -static void gui_init(int argc, char** argv, char **respath) +static nserror nsgtk_init(int argc, char** argv, char **respath) { char buf[PATH_MAX]; char *resource_filename; @@ -467,11 +467,7 @@ static void gui_init(int argc, char** argv, char **respath) free(addr); - if (error != NSERROR_OK) { - warn_user(messages_get_errorcode(error), 0); - } else { - netsurf_main_loop(); - } + return error; } @@ -1321,7 +1317,13 @@ int main(int argc, char** argv) } /* run the browser */ - gui_init(argc, argv, respaths); + ret = nsgtk_init(argc, argv, respaths); + if (ret != NSERROR_OK) { + fprintf(stderr, "NetSurf gtk specific initialise failed (%s)\n", + messages_get_errorcode(ret)); + } else { + netsurf_main_loop(); + } /* common finalisation */ netsurf_exit(); |