summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2014-10-18 18:25:23 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2014-10-18 18:25:23 +0100
commit8dea0fe8947800aae49f4fdf243fc0b468ea15ae (patch)
tree80aea77478fbe9b90aaf8e492e92447a7d0271c2
parent94e2b8cbb508e91a33bf074b62d8160910984fe5 (diff)
downloadnetsurf-8dea0fe8947800aae49f4fdf243fc0b468ea15ae.tar.gz
netsurf-8dea0fe8947800aae49f4fdf243fc0b468ea15ae.tar.bz2
Shouldn't need to have "insider knowledge" of contents. Use the bw API.
-rw-r--r--riscos/window.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/riscos/window.c b/riscos/window.c
index 99010c304..b851775b3 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -2211,9 +2211,8 @@ bool ro_gui_window_menu_prepare(wimp_w w, wimp_i i, wimp_menu *menu,
/* Page Submenu */
- ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE, h == NULL ||
- (content_get_type(h) != CONTENT_HTML &&
- content_get_type(h) != CONTENT_TEXTPLAIN));
+ ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE,
+ !browser_window_can_search(bw));
ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE_INFO, h == NULL);
@@ -2222,8 +2221,7 @@ bool ro_gui_window_menu_prepare(wimp_w w, wimp_i i, wimp_menu *menu,
ro_gui_menu_set_entry_shaded(menu, BROWSER_NEW_WINDOW, h == NULL);
ro_gui_menu_set_entry_shaded(menu, BROWSER_FIND_TEXT,
- h == NULL || (content_get_type(h) != CONTENT_HTML &&
- content_get_type(h) != CONTENT_TEXTPLAIN));
+ !browser_window_can_search(bw));
ro_gui_menu_set_entry_shaded(menu, BROWSER_VIEW_SOURCE, h == NULL);