diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-10-13 01:18:19 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-10-13 01:18:19 +0100 |
commit | bfc7552d8dcc0c737c8282280c4a3f71cf58aed4 (patch) | |
tree | 9cae952ac46a45743aebbf4a47f8f7ce77070bd4 | |
parent | d0655bafc26d30f0e792202ff452907a5ff193d1 (diff) | |
download | netsurf-bfc7552d8dcc0c737c8282280c4a3f71cf58aed4.tar.gz netsurf-bfc7552d8dcc0c737c8282280c4a3f71cf58aed4.tar.bz2 |
remove netsurf_poll callback and netsurf main loop
-rw-r--r-- | beos/gui.cpp | 1 | ||||
-rw-r--r-- | desktop/gui.h | 10 | ||||
-rw-r--r-- | desktop/netsurf.c | 14 | ||||
-rw-r--r-- | desktop/netsurf.h | 6 |
4 files changed, 3 insertions, 28 deletions
diff --git a/beos/gui.cpp b/beos/gui.cpp index 695ab8d21..f957f735d 100644 --- a/beos/gui.cpp +++ b/beos/gui.cpp @@ -980,7 +980,6 @@ static struct gui_fetch_table beos_fetch_table = { }; static struct gui_browser_table beos_browser_table = { - NULL, //nsbeos_gui_poll, beos_schedule, gui_quit, gui_launch_url, diff --git a/desktop/gui.h b/desktop/gui.h index 4dc638c39..528f0c6d0 100644 --- a/desktop/gui.h +++ b/desktop/gui.h @@ -466,12 +466,6 @@ struct gui_browser_table { /* Mandantory entries */ /** - * called to let the frontend update its state and run any - * I/O operations. - */ - void (*poll)(bool active); - - /** * Schedule a callback. * * \param t interval before the callback should be made in ms or @@ -491,7 +485,9 @@ struct gui_browser_table { /* Optional entries */ - /** called to allow the gui to cleanup */ + /** + * called to allow the gui to cleanup. + */ void (*quit)(void); /** diff --git a/desktop/netsurf.c b/desktop/netsurf.c index 579648bae..78ec8ab4c 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -84,8 +84,6 @@ */ #define MINIMUM_MEMORY_CACHE_SIZE (2 * 1024 * 1024) -bool netsurf_quit = false; - static void netsurf_lwc_iterator(lwc_string *str, void *pw) { LOG(("[%3u] %.*s", str->refcnt, (int) lwc_string_length(str), lwc_string_data(str))); @@ -252,18 +250,6 @@ nserror netsurf_init(const char *messages, const char *store_path) /** - * Gui NetSurf main loop. - */ -int netsurf_main_loop(void) -{ - while (!netsurf_quit) { - guit->browser->poll(false); - } - - return 0; -} - -/** * Clean up components used by gui NetSurf. */ diff --git a/desktop/netsurf.h b/desktop/netsurf.h index 6c6a22a86..ff098f437 100644 --- a/desktop/netsurf.h +++ b/desktop/netsurf.h @@ -22,7 +22,6 @@ #include <stdbool.h> #include "utils/errors.h" -extern bool netsurf_quit; extern const char * const netsurf_version; extern const int netsurf_version_major; extern const int netsurf_version_minor; @@ -46,11 +45,6 @@ nserror netsurf_register(struct netsurf_table *table); nserror netsurf_init(const char *messages, const char *store_path); /** - * Run event loop. - */ -extern int netsurf_main_loop(void); - -/** * Finalise NetSurf core */ extern void netsurf_exit(void); |