From c8496df3df7d059528f2d5e735be5c55bfa75ef6 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 11 Jan 2014 22:34:12 +0000 Subject: move window creation and destruction into table --- monkey/browser.c | 5 +++-- monkey/browser.h | 5 +++++ monkey/main.c | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'monkey') diff --git a/monkey/browser.c b/monkey/browser.c index 73549f36a..b9e583c1f 100644 --- a/monkey/browser.c +++ b/monkey/browser.c @@ -88,8 +88,9 @@ monkey_kill_browser_windows(void) } struct gui_window * -gui_create_browser_window(struct browser_window *bw, - struct browser_window *clone, bool new_tab) +gui_window_create(struct browser_window *bw, + struct browser_window *clone, + bool new_tab) { struct gui_window *ret = calloc(sizeof(*ret), 1); if (ret == NULL) diff --git a/monkey/browser.h b/monkey/browser.h index 3ccbe7a91..0b1fd8d13 100644 --- a/monkey/browser.h +++ b/monkey/browser.h @@ -42,4 +42,9 @@ void monkey_window_process_reformats(void); void monkey_window_handle_command(int argc, char **argv); void monkey_kill_browser_windows(void); + + +struct gui_window *gui_window_create(struct browser_window *bw, struct browser_window *clone, bool new_tab); +void gui_window_destroy(struct gui_window *g); + #endif /* NETSURF_MONKEY_BROWSER_H */ diff --git a/monkey/main.c b/monkey/main.c index 2e23f55d6..2ef3bb98f 100644 --- a/monkey/main.c +++ b/monkey/main.c @@ -55,7 +55,7 @@ nsmonkey_init_resource(const char *resource_path) return respath; } -static void gui_quit(void) +static void monkey_quit(void) { urldb_save_cookies(nsoption_charp(cookie_jar)); urldb_save(nsoption_charp(url_file)); @@ -114,8 +114,10 @@ static bool nslog_stream_configure(FILE *fptr) } static struct gui_table monkey_gui_table = { - .poll = &monkey_poll, - .quit = &gui_quit, + .poll = monkey_poll, + .quit = monkey_quit, + .window_create = gui_window_create, + .window_destroy = gui_window_destroy, }; int -- cgit v1.2.3