diff options
Diffstat (limited to 'desktop')
-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 |
6 files changed, 30 insertions, 30 deletions
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); |