diff options
-rw-r--r-- | amiga/gui.c | 4 | ||||
-rw-r--r-- | atari/gui.c | 4 | ||||
-rw-r--r-- | beos/gui.cpp | 4 | ||||
-rw-r--r-- | cocoa/NetsurfApp.m | 2 | ||||
-rw-r--r-- | cocoa/gui.h | 2 | ||||
-rw-r--r-- | cocoa/gui.m | 10 | ||||
-rw-r--r-- | content/fetch.c | 6 | ||||
-rw-r--r-- | content/fs_backing_store.c | 6 | ||||
-rw-r--r-- | content/hlcache.c | 6 | ||||
-rw-r--r-- | content/llcache.c | 8 | ||||
-rw-r--r-- | desktop/browser.c | 14 | ||||
-rw-r--r-- | desktop/gui_factory.c | 32 | ||||
-rw-r--r-- | desktop/gui_misc.h | 2 | ||||
-rw-r--r-- | desktop/gui_table.h | 4 | ||||
-rw-r--r-- | desktop/netsurf.c | 6 | ||||
-rw-r--r-- | desktop/save_pdf.c | 2 | ||||
-rw-r--r-- | framebuffer/gui.c | 4 | ||||
-rw-r--r-- | gtk/gui.c | 4 | ||||
-rw-r--r-- | image/gif.c | 10 | ||||
-rw-r--r-- | image/image_cache.c | 6 | ||||
-rw-r--r-- | monkey/main.c | 4 | ||||
-rw-r--r-- | render/box_construct.c | 4 | ||||
-rw-r--r-- | render/html_css.c | 6 | ||||
-rw-r--r-- | render/html_object.c | 6 | ||||
-rw-r--r-- | riscos/gui.c | 4 | ||||
-rw-r--r-- | windows/main.c | 4 |
26 files changed, 82 insertions, 82 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index ec767352e..26d8509e2 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5466,7 +5466,7 @@ static struct gui_search_web_table amiga_search_web_table = { .provider_update = gui_search_web_provider_update, }; -static struct gui_browser_table amiga_browser_table = { +static struct gui_misc_table amiga_misc_table = { .schedule = ami_schedule, .quit = gui_quit, @@ -5490,7 +5490,7 @@ int main(int argc, char** argv) char *nargv = NULL; struct netsurf_table amiga_table = { - .browser = &amiga_browser_table, + .misc = &amiga_misc_table, .window = &amiga_window_table, .clipboard = amiga_clipboard_table, .download = amiga_download_table, diff --git a/atari/gui.c b/atari/gui.c index 265ae5ace..8acee5802 100644 --- a/atari/gui.c +++ b/atari/gui.c @@ -1094,7 +1094,7 @@ static struct gui_fetch_table atari_fetch_table = { .get_resource_url = gui_get_resource_url, }; -static struct gui_browser_table atari_browser_table = { +static struct gui_misc_table atari_misc_table = { .schedule = atari_schedule, .quit = gui_quit, @@ -1121,7 +1121,7 @@ int main(int argc, char** argv) nserror ret; struct netsurf_table atari_table = { - .browser = &atari_browser_table, + .misc = &atari_misc_table, .window = &atari_window_table, .clipboard = &atari_clipboard_table, .download = atari_download_table, diff --git a/beos/gui.cpp b/beos/gui.cpp index 1e653a0fe..96442b400 100644 --- a/beos/gui.cpp +++ b/beos/gui.cpp @@ -962,7 +962,7 @@ static struct gui_fetch_table beos_fetch_table = { NULL, // fetch_mimetype }; -static struct gui_browser_table beos_browser_table = { +static struct gui_misc_table beos_misc_table = { beos_schedule, gui_quit, gui_launch_url, @@ -979,7 +979,7 @@ int main(int argc, char** argv) nserror ret; BPath options; struct netsurf_table beos_table = { - &beos_browser_table, + &beos_misc_table, beos_window_table, beos_download_table, &beos_clipboard_table, diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m index 034ffda53..3d5ff0691 100644 --- a/cocoa/NetsurfApp.m +++ b/cocoa/NetsurfApp.m @@ -228,7 +228,7 @@ int main( int argc, char **argv ) nsurl *url; nserror error; struct netsurf_table cocoa_table = { - .browser = cocoa_browser_table, + .misc = cocoa_misc_table, .window = cocoa_window_table, .clipboard = cocoa_clipboard_table, .download = cocoa_download_table, diff --git a/cocoa/gui.h b/cocoa/gui.h index 757140030..b0ff648f6 100644 --- a/cocoa/gui.h +++ b/cocoa/gui.h @@ -20,7 +20,7 @@ extern struct gui_window_table *cocoa_window_table; extern struct gui_clipboard_table *cocoa_clipboard_table; -extern struct gui_browser_table *cocoa_browser_table; +extern struct gui_misc_table *cocoa_misc_table; extern NSString * const kCookiesFileOption; extern NSString * const kURLsFileOption; diff --git a/cocoa/gui.m b/cocoa/gui.m index 0cd3d8071..351b6e5fa 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -279,7 +279,7 @@ static struct gui_window_table window_table = { .set_scroll = gui_window_set_scroll, .get_dimensions = gui_window_get_dimensions, .update_extent = gui_window_update_extent, - .reformat = cocoa_window_reformat, + .reformat = cocoa_window_reformat, .set_title = gui_window_set_title, .set_url = gui_window_set_url, @@ -288,7 +288,7 @@ static struct gui_window_table window_table = { .set_pointer = gui_window_set_pointer, .place_caret = gui_window_place_caret, .remove_caret = gui_window_remove_caret, - .new_content = gui_window_new_content, + .new_content = gui_window_new_content, .start_throbber = gui_window_start_throbber, .stop_throbber = gui_window_stop_throbber, .create_form_select_menu = gui_create_form_select_menu, @@ -297,11 +297,11 @@ static struct gui_window_table window_table = { struct gui_window_table *cocoa_window_table = &window_table; -static struct gui_browser_table browser_table = { - .schedule = cocoa_schedule, +static struct gui_misc_table browser_table = { + .schedule = cocoa_schedule, .launch_url = gui_launch_url, .cert_verify = gui_cert_verify, }; -struct gui_browser_table *cocoa_browser_table = &browser_table; +struct gui_misc_table *cocoa_misc_table = &browser_table; diff --git a/content/fetch.c b/content/fetch.c index 47e6fc88e..415ca2651 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -277,7 +277,7 @@ static void fetcher_poll(void *unused) } /* schedule active fetchers to run again in 10ms */ - guit->browser->schedule(SCHEDULE_TIME, fetcher_poll, NULL); + guit->misc->schedule(SCHEDULE_TIME, fetcher_poll, NULL); } } @@ -428,7 +428,7 @@ nserror fetcher_fdset(fd_set *read_fd_set, * select on. All the other fetchers continue to need * polling frequently. */ - guit->browser->schedule(FDSET_TIMEOUT, fetcher_poll, NULL); + guit->misc->schedule(FDSET_TIMEOUT, fetcher_poll, NULL); } *maxfd_out = maxfd; @@ -565,7 +565,7 @@ fetch_start(nsurl *url, if (fetch_dispatch_jobs()) { FETCH_LOG("scheduling poll"); /* schedule active fetchers to run again in 10ms */ - guit->browser->schedule(10, fetcher_poll, NULL); + guit->misc->schedule(10, fetcher_poll, NULL); } *fetch_out = fetch; diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c index b9490ddcc..0c765962b 100644 --- a/content/fs_backing_store.c +++ b/content/fs_backing_store.c @@ -911,7 +911,7 @@ get_store_entry(struct store_state *state, nsurl *url, struct store_entry **bse) state->entries_dirty = true; - guit->browser->schedule(CONTROL_MAINT_TIME, control_maintinance, state); + guit->misc->schedule(CONTROL_MAINT_TIME, control_maintinance, state); return NSERROR_OK; } @@ -1052,7 +1052,7 @@ set_store_entry(struct store_state *state, /* ensure control maintinance scheduled. */ state->entries_dirty = true; - guit->browser->schedule(CONTROL_MAINT_TIME, control_maintinance, state); + guit->misc->schedule(CONTROL_MAINT_TIME, control_maintinance, state); *bse = se; @@ -1587,7 +1587,7 @@ finalise(void) unsigned int op_count; if (storestate != NULL) { - guit->browser->schedule(-1, control_maintinance, storestate); + guit->misc->schedule(-1, control_maintinance, storestate); write_entries(storestate); write_blocks(storestate); diff --git a/content/hlcache.c b/content/hlcache.c index 3f0e810a5..06d9f6d74 100644 --- a/content/hlcache.c +++ b/content/hlcache.c @@ -146,7 +146,7 @@ static void hlcache_clean(void *ignored) llcache_clean(false); /* Re-schedule ourselves */ - guit->browser->schedule(hlcache->params.bg_clean_time, hlcache_clean, NULL); + guit->misc->schedule(hlcache->params.bg_clean_time, hlcache_clean, NULL); } /** @@ -537,7 +537,7 @@ hlcache_initialise(const struct hlcache_parameters *hlcache_parameters) hlcache->params = *hlcache_parameters; /* Schedule the cache cleanup */ - guit->browser->schedule(hlcache->params.bg_clean_time, hlcache_clean, NULL); + guit->misc->schedule(hlcache->params.bg_clean_time, hlcache_clean, NULL); return NSERROR_OK; } @@ -546,7 +546,7 @@ hlcache_initialise(const struct hlcache_parameters *hlcache_parameters) void hlcache_stop(void) { /* Remove the hlcache_clean schedule */ - guit->browser->schedule(-1, hlcache_clean, NULL); + guit->misc->schedule(-1, hlcache_clean, NULL); } /* See hlcache.h for documentation */ diff --git a/content/llcache.c b/content/llcache.c index 6e8b4017f..7144dc585 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -2529,7 +2529,7 @@ static void llcache_persist(void *p) * Schedule a check in the future to see if * overall performance is too slow to be useful. */ - guit->browser->schedule( + guit->misc->schedule( llcache->time_quantum * 100, llcache_persist_slowcheck, NULL); @@ -2582,7 +2582,7 @@ static void llcache_persist(void *p) total_written, total_elapsed, total_bandwidth); LLCACHE_LOG("Rescheduling writeout in %dms", next); - guit->browser->schedule(next, llcache_persist, NULL); + guit->misc->schedule(next, llcache_persist, NULL); } @@ -2657,7 +2657,7 @@ static void llcache_fetch_callback(const fetch_msg *msg, void *p) /* record when the fetch finished */ object->cache.fin_time = time(NULL); - guit->browser->schedule(5000, llcache_persist, NULL); + guit->misc->schedule(5000, llcache_persist, NULL); } break; @@ -3440,7 +3440,7 @@ static void llcache_users_not_caught_up(void) { if (llcache->all_caught_up) { llcache->all_caught_up = false; - guit->browser->schedule(0, llcache_catch_up_all_users, NULL); + guit->misc->schedule(0, llcache_catch_up_all_users, NULL); } } diff --git a/desktop/browser.c b/desktop/browser.c index 04e8efbf7..48f69eaae 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -958,7 +958,7 @@ browser_window_download(struct browser_window *bw, NULL, NULL, &l); if (error == NSERROR_NO_FETCH_HANDLER) { /* no internal handler for this type, call out to frontend */ - error = guit->browser->launch_url(url); + error = guit->misc->launch_url(url); } else if (error != NSERROR_OK) { LOG("Failed to fetch download: %d", error); } else { @@ -1440,7 +1440,7 @@ static nserror browser_window_callback(hlcache_handle *c, hotlist_update_url(hlcache_handle_get_url(c)); if (bw->refresh_interval != -1) { - guit->browser->schedule(bw->refresh_interval * 10, + guit->misc->schedule(bw->refresh_interval * 10, browser_window_refresh, bw); } break; @@ -1759,12 +1759,12 @@ static void browser_window_destroy_internal(struct browser_window *bw) } /* clear any pending callbacks */ - guit->browser->schedule(-1, browser_window_refresh, bw); + guit->misc->schedule(-1, browser_window_refresh, bw); /* The ugly cast here is so the reformat function can be * passed a gui window pointer in its API rather than void* */ LOG("Clearing schedule %p(%p)", guit->window->reformat, bw->window); - guit->browser->schedule(-1, (void(*)(void*))guit->window->reformat, bw->window); + guit->misc->schedule(-1, (void(*)(void*))guit->window->reformat, bw->window); /* If this brower window is not the root window, and has focus, unset * the root browser window's focus pointer. */ @@ -2061,7 +2061,7 @@ nserror browser_window_navigate(struct browser_window *bw, /** \todo does this always try and download even * unverifiable content? */ - error = guit->browser->launch_url(url); + error = guit->misc->launch_url(url); break; default: /* report error to user */ @@ -2383,7 +2383,7 @@ void browser_window_stop(struct browser_window *bw) assert(error == NSERROR_OK); } - guit->browser->schedule(-1, browser_window_refresh, bw); + guit->misc->schedule(-1, browser_window_refresh, bw); if (bw->children) { children = bw->rows * bw->cols; @@ -2525,7 +2525,7 @@ nserror browser_window_schedule_reformat(struct browser_window *bw) /* The ugly cast here is so the reformat function can be * passed a gui window pointer in its API rather than void* */ - guit->browser->schedule(0, (void(*)(void*))guit->window->reformat, bw->window); + guit->misc->schedule(0, (void(*)(void*))guit->window->reformat, bw->window); return NSERROR_OK; } diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c index 22364ab97..3150d756c 100644 --- a/desktop/gui_factory.c +++ b/desktop/gui_factory.c @@ -676,34 +676,34 @@ gui_default_pdf_password(char **owner_pass, char **user_pass, char *path) save_pdf(path); } -/** verify browser table is valid */ -static nserror verify_browser_register(struct gui_browser_table *gbt) +/** verify misc table is valid */ +static nserror verify_misc_register(struct gui_misc_table *gmt) { /* check table is present */ - if (gbt == NULL) { + if (gmt == NULL) { return NSERROR_BAD_PARAMETER; } /* check the mandantory fields are set */ - if (gbt->schedule == NULL) { + if (gmt->schedule == NULL) { return NSERROR_BAD_PARAMETER; } /* fill in the optional entries with defaults */ - if (gbt->quit == NULL) { - gbt->quit = gui_default_quit; + if (gmt->quit == NULL) { + gmt->quit = gui_default_quit; } - if (gbt->launch_url == NULL) { - gbt->launch_url = gui_default_launch_url; + if (gmt->launch_url == NULL) { + gmt->launch_url = gui_default_launch_url; } - if (gbt->cert_verify == NULL) { - gbt->cert_verify = gui_default_cert_verify; + if (gmt->cert_verify == NULL) { + gmt->cert_verify = gui_default_cert_verify; } - if (gbt->login == NULL) { - gbt->login = gui_default_401login_open; + if (gmt->login == NULL) { + gmt->login = gui_default_401login_open; } - if (gbt->pdf_password == NULL) { - gbt->pdf_password = gui_default_pdf_password; + if (gmt->pdf_password == NULL) { + gmt->pdf_password = gui_default_pdf_password; } return NSERROR_OK; } @@ -724,8 +724,8 @@ nserror netsurf_register(struct netsurf_table *gt) return NSERROR_BAD_PARAMETER; } - /* browser table */ - err = verify_browser_register(gt->browser); + /* miscellaneous table */ + err = verify_misc_register(gt->misc); if (err != NSERROR_OK) { return err; } diff --git a/desktop/gui_misc.h b/desktop/gui_misc.h index a35ee513f..a46c85367 100644 --- a/desktop/gui_misc.h +++ b/desktop/gui_misc.h @@ -36,7 +36,7 @@ struct nsurl; * function table implementing GUI interface to miscelaneous browser * functionality */ -struct gui_browser_table { +struct gui_misc_table { /* Mandantory entries */ /** diff --git a/desktop/gui_table.h b/desktop/gui_table.h index 52cdde2ea..6952228e2 100644 --- a/desktop/gui_table.h +++ b/desktop/gui_table.h @@ -27,7 +27,7 @@ #ifndef _NETSURF_DESKTOP_GUI_TABLE_H_ #define _NETSURF_DESKTOP_GUI_TABLE_H_ -struct gui_browser_table; +struct gui_misc_table; struct gui_window_table; struct gui_download_table; struct gui_clipboard_table; @@ -52,7 +52,7 @@ struct netsurf_table { * Provides miscellaneous browser functionality. The table * is mandantory and must be provided. */ - struct gui_browser_table *browser; + struct gui_misc_table *misc; /** * Window table. diff --git a/desktop/netsurf.c b/desktop/netsurf.c index 2b01053f1..46d8d6728 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -106,14 +106,14 @@ static nserror netsurf_llcache_query_handler(const llcache_query *query, { switch (query->type) { case LLCACHE_QUERY_AUTH: - guit->browser->login(query->url, query->data.auth.realm, cb, cbpw); + guit->misc->login(query->url, query->data.auth.realm, cb, cbpw); break; case LLCACHE_QUERY_REDIRECT: /** \todo Need redirect query dialog */ /* For now, do nothing, as this query type isn't emitted yet */ break; case LLCACHE_QUERY_SSL: - guit->browser->cert_verify(query->url, query->data.ssl.certs, + guit->misc->cert_verify(query->url, query->data.ssl.certs, query->data.ssl.num, cb, cbpw); break; } @@ -245,7 +245,7 @@ void netsurf_exit(void) hlcache_stop(); LOG("Closing GUI"); - guit->browser->quit(); + guit->misc->quit(); LOG("Finalising JavaScript"); js_finalise(); diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c index aeec9ce2e..c54421cdc 100644 --- a/desktop/save_pdf.c +++ b/desktop/save_pdf.c @@ -774,7 +774,7 @@ void pdf_end(void) /*Encryption on*/ if (option_enable_PDF_password) - guit->browser->pdf_password(&owner_pass, &user_pass, + guit->misc->pdf_password(&owner_pass, &user_pass, (void *)settings->output); else save_pdf(settings->output); diff --git a/framebuffer/gui.c b/framebuffer/gui.c index ef1d8c68c..210341b5d 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -2050,7 +2050,7 @@ static struct gui_window_table framebuffer_window_table = { }; -static struct gui_browser_table framebuffer_browser_table = { +static struct gui_misc_table framebuffer_misc_table = { .schedule = framebuffer_schedule, .quit = gui_quit, @@ -2072,7 +2072,7 @@ main(int argc, char** argv) nserror ret; nsfb_t *nsfb; struct netsurf_table framebuffer_table = { - .browser = &framebuffer_browser_table, + .misc = &framebuffer_misc_table, .window = &framebuffer_window_table, .clipboard = framebuffer_clipboard_table, .fetch = framebuffer_fetch_table, @@ -1010,7 +1010,7 @@ static nserror nsgtk_option_init(int *pargc, char** argv) return NSERROR_OK; } -static struct gui_browser_table nsgtk_browser_table = { +static struct gui_misc_table nsgtk_misc_table = { .schedule = nsgtk_schedule, .quit = gui_quit, @@ -1049,7 +1049,7 @@ int main(int argc, char** argv) char *cache_home = NULL; nserror ret; struct netsurf_table nsgtk_table = { - .browser = &nsgtk_browser_table, + .misc = &nsgtk_misc_table, .window = nsgtk_window_table, .clipboard = nsgtk_clipboard_table, .download = nsgtk_download_table, diff --git a/image/gif.c b/image/gif.c index fb0985a45..b11a371c6 100644 --- a/image/gif.c +++ b/image/gif.c @@ -155,7 +155,7 @@ static void nsgif_animate(void *p) delay = gif->gif->frames[gif->current_frame].frame_delay; if (delay < nsoption_int(minimum_gif_delay)) delay = nsoption_int(minimum_gif_delay); - guit->browser->schedule(delay * 10, nsgif_animate, gif); + guit->misc->schedule(delay * 10, nsgif_animate, gif); } if ((!nsoption_bool(animate_images)) || @@ -288,7 +288,7 @@ static bool nsgif_convert(struct content *c) /* Schedule the animation if we have one */ gif->current_frame = 0; if (gif->gif->frame_count_partial > 1) - guit->browser->schedule(gif->gif->frames[0].frame_delay * 10, + guit->misc->schedule(gif->gif->frames[0].frame_delay * 10, nsgif_animate, c); @@ -351,7 +351,7 @@ static void nsgif_destroy(struct content *c) nsgif_content *gif = (nsgif_content *) c; /* Free all the associated memory buffers */ - guit->browser->schedule(-1, nsgif_animate, c); + guit->misc->schedule(-1, nsgif_animate, c); gif_finalise(gif->gif); free(gif->gif); } @@ -403,7 +403,7 @@ static void nsgif_add_user(struct content *c) if (content_count_users(c) == 1) { /* First user, and content already converted, so start the animation. */ if (gif->gif->frame_count_partial > 1) { - guit->browser->schedule(gif->gif->frames[0].frame_delay * 10, + guit->misc->schedule(gif->gif->frames[0].frame_delay * 10, nsgif_animate, c); } } @@ -413,7 +413,7 @@ static void nsgif_remove_user(struct content *c) { if (content_count_users(c) == 1) { /* Last user is about to be removed from this content, so stop the animation. */ - guit->browser->schedule(-1, nsgif_animate, c); + guit->misc->schedule(-1, nsgif_animate, c); } } diff --git a/image/image_cache.c b/image/image_cache.c index 13ec3b97b..4631ee5f3 100644 --- a/image/image_cache.c +++ b/image/image_cache.c @@ -288,7 +288,7 @@ static void image_cache__background_update(void *p) image_cache__clean(icache); - guit->browser->schedule(icache->params.bg_clean_time, + guit->misc->schedule(icache->params.bg_clean_time, image_cache__background_update, icache); } @@ -370,7 +370,7 @@ image_cache_init(const struct image_cache_parameters *image_cache_parameters) image_cache->params = *image_cache_parameters; - guit->browser->schedule(image_cache->params.bg_clean_time, + guit->misc->schedule(image_cache->params.bg_clean_time, image_cache__background_update, image_cache); @@ -385,7 +385,7 @@ nserror image_cache_fini(void) { unsigned int op_count; - guit->browser->schedule(-1, image_cache__background_update, image_cache); + guit->misc->schedule(-1, image_cache__background_update, image_cache); LOG("Size at finish %" PRIsizet " (in %d)", image_cache->total_bitmap_size, image_cache->bitmap_count); diff --git a/monkey/main.c b/monkey/main.c index 9569f9754..e09d0ea4a 100644 --- a/monkey/main.c +++ b/monkey/main.c @@ -233,7 +233,7 @@ static bool nslog_stream_configure(FILE *fptr) return true; } -static struct gui_browser_table monkey_browser_table = { +static struct gui_misc_table monkey_misc_table = { .schedule = monkey_schedule, .quit = monkey_quit, @@ -314,7 +314,7 @@ main(int argc, char **argv) char buf[PATH_MAX]; nserror ret; struct netsurf_table monkey_table = { - .browser = &monkey_browser_table, + .misc = &monkey_misc_table, .window = monkey_window_table, .download = monkey_download_table, .fetch = monkey_fetch_table, diff --git a/render/box_construct.c b/render/box_construct.c index adb450946..23d41203f 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -187,7 +187,7 @@ nserror dom_to_box(dom_node *n, html_content *c, box_construct_complete_cb cb) ctx->cb = cb; ctx->bctx = c->bctx; - return guit->browser->schedule(0, (void *)convert_xml_to_box, ctx); + return guit->misc->schedule(0, (void *)convert_xml_to_box, ctx); } /* mapping from CSS display to box type @@ -448,7 +448,7 @@ void convert_xml_to_box(struct box_construct_ctx *ctx) } while (++num_processed < max_processed_before_yield); /* More work to do: schedule a continuation */ - guit->browser->schedule(0, (void *)convert_xml_to_box, ctx); + guit->misc->schedule(0, (void *)convert_xml_to_box, ctx); } /** diff --git a/render/html_css.c b/render/html_css.c index a90ea6323..6761a6502 100644 --- a/render/html_css.c +++ b/render/html_css.c @@ -292,7 +292,7 @@ static void html_css_process_modified_styles(void *pw) /* If we failed to process any sheet, schedule a retry */ if (all_done == false) { - guit->browser->schedule(1000, html_css_process_modified_styles, c); + guit->misc->schedule(1000, html_css_process_modified_styles, c); } } @@ -316,7 +316,7 @@ bool html_css_update_style(html_content *c, dom_node *style) s->modified = true; - guit->browser->schedule(0, html_css_process_modified_styles, c); + guit->misc->schedule(0, html_css_process_modified_styles, c); return true; } @@ -445,7 +445,7 @@ nserror html_css_free_stylesheets(html_content *html) { unsigned int i; - guit->browser->schedule(-1, html_css_process_modified_styles, html); + guit->misc->schedule(-1, html_css_process_modified_styles, html); for (i = 0; i != html->stylesheet_count; i++) { if (html->stylesheets[i].sheet != NULL) { diff --git a/render/html_object.c b/render/html_object.c index 933950ec3..e30b3ab09 100644 --- a/render/html_object.c +++ b/render/html_object.c @@ -322,7 +322,7 @@ html_object_callback(hlcache_handle *object, case CONTENT_MSG_REFRESH: if (content_get_type(object) == CONTENT_HTML) { /* only for HTML objects */ - guit->browser->schedule(event->data.delay * 1000, + guit->misc->schedule(event->data.delay * 1000, html_object_refresh, o); } @@ -619,7 +619,7 @@ nserror html_object_close_objects(html_content *html) continue; if (content_get_type(object->content) == CONTENT_HTML) { - guit->browser->schedule(-1, html_object_refresh, object); + guit->misc->schedule(-1, html_object_refresh, object); } content_close(object->content); @@ -636,7 +636,7 @@ nserror html_object_free_objects(html_content *html) LOG("object %p", victim->content); if (content_get_type(victim->content) == CONTENT_HTML) { - guit->browser->schedule(-1, html_object_refresh, victim); + guit->misc->schedule(-1, html_object_refresh, victim); } hlcache_handle_release(victim->content); } diff --git a/riscos/gui.c b/riscos/gui.c index 01fa7b50f..6bd7399af 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -2383,7 +2383,7 @@ static struct gui_fetch_table riscos_fetch_table = { .mimetype = fetch_mimetype, }; -static struct gui_browser_table riscos_browser_table = { +static struct gui_misc_table riscos_misc_table = { .schedule = riscos_schedule, .quit = gui_quit, @@ -2424,7 +2424,7 @@ int main(int argc, char** argv) os_error *error; nserror ret; struct netsurf_table riscos_table = { - .browser = &riscos_browser_table, + .misc = &riscos_misc_table, .window = riscos_window_table, .clipboard = riscos_clipboard_table, .download = riscos_download_table, diff --git a/windows/main.c b/windows/main.c index 7a23f711c..736199cd9 100644 --- a/windows/main.c +++ b/windows/main.c @@ -132,7 +132,7 @@ static nserror set_defaults(struct nsoption_s *defaults) } -static struct gui_browser_table win32_browser_table = { +static struct gui_misc_table win32_misc_table = { .schedule = win32_schedule, }; @@ -152,7 +152,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) const char *addr; nsurl *url; struct netsurf_table win32_table = { - .browser = &win32_browser_table, + .misc = &win32_misc_table, .window = win32_window_table, .clipboard = win32_clipboard_table, .download = win32_download_table, |