Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7b7b1507d01b3e078790150d6b5f59ebaf0b45c3
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7b7b1507d01b3e078790150d6b5f59ebaf0b45c3
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7b7b1507d01b3e078790150d6b5f59ebaf0b45c3
The branch, master has been updated
via 7b7b1507d01b3e078790150d6b5f59ebaf0b45c3 (commit)
from 2917af0a967bda993b8c1c5f194eea0b9881b6be (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=7b7b1507d01b3e078790150d6b5f59ebaf0b45c3
commit 7b7b1507d01b3e078790150d6b5f59ebaf0b45c3
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Revert "RISC OS: Ensure core's hotlist_init is called on startup."
This reverts commit 743637a8d2105df6ffc464a3cb4753cdc8c1401f.
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index ae27bf5..15c5f54 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -552,25 +552,24 @@ nserror ro_gui_hotlist_present(void)
error->errmess);
}
- LOG("Presenting hotlist");
- ro_gui_dialog_open_top(hotlist_window->core.wh,
- hotlist_window->core.toolbar,
- 600, 800);
+ 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);
+ }
- return NSERROR_OK;
+ return res;
}
/* 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, 10 insertions(+), 11 deletions(-)
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index ae27bf5..15c5f54 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -552,25 +552,24 @@ nserror ro_gui_hotlist_present(void)
error->errmess);
}
- LOG("Presenting hotlist");
- ro_gui_dialog_open_top(hotlist_window->core.wh,
- hotlist_window->core.toolbar,
- 600, 800);
+ 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);
+ }
- return NSERROR_OK;
+ return res;
}
/* 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
