diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2016-12-29 14:51:43 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2016-12-29 14:51:43 +0000 |
commit | 354656b442cb9583fe8f690e9aa3e58ff50b6dce (patch) | |
tree | 8a83eb3c5887cbdfb4c79071cf7656685940861c /frontends | |
parent | 4e5e9f1f5af2e526a87f38936aed0c4c100b5051 (diff) | |
download | netsurf-354656b442cb9583fe8f690e9aa3e58ff50b6dce.tar.gz netsurf-354656b442cb9583fe8f690e9aa3e58ff50b6dce.tar.bz2 |
RISC OS: Update for new hotlist API.
This allows the hotlist backend to work before the hotlist window opens.
Diffstat (limited to 'frontends')
-rw-r--r-- | frontends/riscos/gui.c | 4 | ||||
-rw-r--r-- | frontends/riscos/hotlist.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index 3ac9d4aa9..27b81d92e 100644 --- a/frontends/riscos/gui.c +++ b/frontends/riscos/gui.c @@ -55,6 +55,7 @@ #include "netsurf/cookie_db.h" #include "netsurf/url_db.h" #include "desktop/save_complete.h" +#include "desktop/hotlist.h" #include "content/backing_store.h" #include "riscos/gui.h" @@ -1178,9 +1179,10 @@ static nserror gui_init(int argc, char** argv) /* Initialise save complete functionality */ save_complete_init(); - /* Load in visited URLs and Cookies */ + /* Load in visited URLs, Cookies, and hostlist */ urldb_load(nsoption_charp(url_path)); urldb_load_cookies(nsoption_charp(cookie_file)); + hotlist_init(nsoption_charp(hotlist_path)); /* Initialise with the wimp */ error = xwimp_initialise(wimp_VERSION_RO38, task_name, diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c index 24ced69b5..5eb30265a 100644 --- a/frontends/riscos/hotlist.c +++ b/frontends/riscos/hotlist.c @@ -496,9 +496,8 @@ static nserror ro_hotlist_init(void) return res; } - res = hotlist_init(ncwin->core.cb_table, - (struct core_window *)ncwin, - nsoption_charp(hotlist_path)); + res = hotlist_manager_init(ncwin->core.cb_table, + (struct core_window *)ncwin); if (res != NSERROR_OK) { free(ncwin); return res; |