RISC OS: Update for new hotlist API.

This allows the hotlist backend to work before the hotlist window opens.
This commit is contained in:
Michael Drake 2016-12-29 14:51:43 +00:00
parent 4e5e9f1f5a
commit 354656b442
2 changed files with 5 additions and 4 deletions

View File

@ -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,

View File

@ -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;