Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/743637a8d2105df6ffc464a3cb4753cdc8c1401f
...commit
http://git.netsurf-browser.org/netsurf.git/commit/743637a8d2105df6ffc464a3cb4753cdc8c1401f
...tree
http://git.netsurf-browser.org/netsurf.git/tree/743637a8d2105df6ffc464a3cb4753cdc8c1401f
The branch, master has been updated
via 743637a8d2105df6ffc464a3cb4753cdc8c1401f (commit)
from 49b1b0b3a51092d7612e496ae6bc8d7d8651425b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=743637a8d2105df6ffc464a3cb4753cdc8c1401f
commit 743637a8d2105df6ffc464a3cb4753cdc8c1401f
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
RISC OS: Ensure core's hotlist_init is called on startup.
Until the core hotlist_init is called, it is impossible to add
pages to the hotlist. This means we need to ensure it is called
on startup, rather than when first showing the hotlist.
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index 24ced69..80dd7d3 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -554,24 +554,25 @@ nserror ro_gui_hotlist_present(void)
error->errmess);
}
- res = ro_hotlist_init();
- if (res == NSERROR_OK) {
- LOG("Presenting");
- ro_gui_dialog_open_top(hotlist_window->core.wh,
- hotlist_window->core.toolbar,
- 600, 800);
- } else {
- LOG("Failed presenting code %d", res);
- }
+ LOG("Presenting hotlist");
+ ro_gui_dialog_open_top(hotlist_window->core.wh,
+ hotlist_window->core.toolbar,
+ 600, 800);
- return res;
+ return NSERROR_OK;
}
/* exported interface documented in riscos/hotlist.h */
void ro_gui_hotlist_initialise(void)
{
+ nserror res;
dialog_hotlist_template = ro_gui_dialog_load_template("tree");
+
+ res = ro_hotlist_init();
+ if (res != NSERROR_OK) {
+ LOG("Failed initialising hotlist %d", res);
+ }
}
-----------------------------------------------------------------------
Summary of changes:
frontends/riscos/hotlist.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index 24ced69..80dd7d3 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -554,24 +554,25 @@ nserror ro_gui_hotlist_present(void)
error->errmess);
}
- res = ro_hotlist_init();
- if (res == NSERROR_OK) {
- LOG("Presenting");
- ro_gui_dialog_open_top(hotlist_window->core.wh,
- hotlist_window->core.toolbar,
- 600, 800);
- } else {
- LOG("Failed presenting code %d", res);
- }
+ LOG("Presenting hotlist");
+ ro_gui_dialog_open_top(hotlist_window->core.wh,
+ hotlist_window->core.toolbar,
+ 600, 800);
- return res;
+ return NSERROR_OK;
}
/* exported interface documented in riscos/hotlist.h */
void ro_gui_hotlist_initialise(void)
{
+ nserror res;
dialog_hotlist_template = ro_gui_dialog_load_template("tree");
+
+ res = ro_hotlist_init();
+ if (res != NSERROR_OK) {
+ LOG("Failed initialising hotlist %d", res);
+ }
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
