diff options
author | Vincent Sanders <vince@kyllikki.org> | 2016-12-28 16:14:19 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2016-12-28 16:14:19 +0000 |
commit | 96e073a29777bbe927f0bc7187f7032d3f51e68b (patch) | |
tree | a74404287ae531793095126a3499f2d4d34c98fe /frontends/riscos/window.c | |
parent | 770c277ccc182f504be0a316390d59c05a59e041 (diff) | |
parent | af6139bcb5845d4cdbc852b113ac8fabcee29097 (diff) | |
download | netsurf-96e073a29777bbe927f0bc7187f7032d3f51e68b.tar.gz netsurf-96e073a29777bbe927f0bc7187f7032d3f51e68b.tar.bz2 |
Merge branch 'vince/ro-corewindow'
Conflicts:
frontends/riscos/sslcert.h
Diffstat (limited to 'frontends/riscos/window.c')
-rw-r--r-- | frontends/riscos/window.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c index 58cd86e49..3e84846a3 100644 --- a/frontends/riscos/window.c +++ b/frontends/riscos/window.c @@ -1944,7 +1944,7 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, return true; case IS_WIMP_KEY + wimp_KEY_F6: /* Hotlist */ - ro_gui_hotlist_open(); + ro_gui_hotlist_present(); return true; case IS_WIMP_KEY + wimp_KEY_F7: /* Show local history */ @@ -1953,7 +1953,7 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, case IS_WIMP_KEY + wimp_KEY_CONTROL + wimp_KEY_F7: /* Show global history */ - ro_gui_global_history_open(); + ro_gui_global_history_present(); return true; case IS_WIMP_KEY + wimp_KEY_F8: /* View source */ @@ -2696,7 +2696,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, ro_gui_window_action_local_history(g); break; case HISTORY_SHOW_GLOBAL: - ro_gui_global_history_open(); + ro_gui_global_history_present(); break; /* hotlist actions */ @@ -2704,12 +2704,12 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, ro_gui_window_action_add_bookmark(g); break; case HOTLIST_SHOW: - ro_gui_hotlist_open(); + ro_gui_hotlist_present(); break; /* cookies actions */ case COOKIES_SHOW: - ro_gui_cookies_open(); + ro_gui_cookies_present(); break; case COOKIES_DELETE: @@ -3607,7 +3607,7 @@ void ro_gui_window_toolbar_click(void *data, break; case TOOLBAR_BUTTON_HISTORY_GLOBAL: - ro_gui_global_history_open(); + ro_gui_global_history_present(); break; case TOOLBAR_BUTTON_HOME: @@ -3623,7 +3623,7 @@ void ro_gui_window_toolbar_click(void *data, break; case TOOLBAR_BUTTON_BOOKMARK_OPEN: - ro_gui_hotlist_open(); + ro_gui_hotlist_present(); break; case TOOLBAR_BUTTON_BOOKMARK_ADD: |