diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2013-05-27 14:18:01 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2013-05-28 14:16:11 +0100 |
| commit | 63d7247a9cace6cc729441508c0cfd82f043ff4d (patch) | |
| tree | a8c599193d94b3a0267c84b9b2d1ad32c08c0505 /riscos | |
| parent | 4ae69da5ea4eb2791af6a09edc6dfaedada6d325 (diff) | |
| download | netsurf-63d7247a9cace6cc729441508c0cfd82f043ff4d.tar.gz netsurf-63d7247a9cace6cc729441508c0cfd82f043ff4d.tar.bz2 | |
fix mismatched option name and variable names
block_ads should be block_advertisments to match option name
toolbar_status_width should be toolbar_status_size to match option name
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/configure/con_content.c | 4 | ||||
| -rw-r--r-- | riscos/window.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c index 122b0e3a5..d4f3e46bb 100644 --- a/riscos/configure/con_content.c +++ b/riscos/configure/con_content.c @@ -44,7 +44,7 @@ bool ro_gui_options_content_initialise(wimp_w w) { /* set the current values */ ro_gui_set_icon_selected_state(w, CONTENT_BLOCK_ADVERTISEMENTS, - nsoption_bool(block_ads)); + nsoption_bool(block_advertisements)); ro_gui_set_icon_selected_state(w, CONTENT_BLOCK_POPUPS, nsoption_bool(block_popups)); ro_gui_set_icon_selected_state(w, CONTENT_NO_PLUGINS, @@ -88,7 +88,7 @@ void ro_gui_options_content_default(wimp_pointer *pointer) bool ro_gui_options_content_ok(wimp_w w) { - nsoption_set_bool(block_ads, + nsoption_set_bool(block_advertisements, ro_gui_get_icon_selected_state(w, CONTENT_BLOCK_ADVERTISEMENTS)); nsoption_set_bool(block_popups, diff --git a/riscos/window.c b/riscos/window.c index e7b3699b7..772a0d1b1 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -521,7 +521,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, /* Add in a toolbar and status bar */ g->status_bar = ro_gui_status_bar_create(g->window, - nsoption_int(toolbar_status_width)); + nsoption_int(toolbar_status_size)); g->toolbar = ro_toolbar_create(NULL, g->window, THEME_STYLE_BROWSER_TOOLBAR, TOOLBAR_FLAGS_NONE, &ro_gui_window_toolbar_callbacks, g, @@ -4712,7 +4712,7 @@ void ro_gui_window_default_options(struct browser_window *bw) ro_toolbar_get_display_throbber(gui->toolbar)); } if (gui->status_bar != NULL) - nsoption_set_int(toolbar_status_width, + nsoption_set_int(toolbar_status_size, ro_gui_status_bar_get_width(gui->status_bar)); } |