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 /gtk | |
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 'gtk')
-rw-r--r-- | gtk/dialogs/preferences.c | 2 | ||||
-rw-r--r-- | gtk/gui.c | 4 | ||||
-rw-r--r-- | gtk/scaffolding.c | 2 | ||||
-rw-r--r-- | gtk/window.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gtk/dialogs/preferences.c b/gtk/dialogs/preferences.c index 430554caf..ca4ac2ef7 100644 --- a/gtk/dialogs/preferences.c +++ b/gtk/dialogs/preferences.c @@ -374,7 +374,7 @@ SPINBUTTON_SIGNALS(spinDiscCacheAge, disc_cache_age, 1.0) TOGGLEBUTTON_SIGNALS(checkDisablePopups, disable_popups) /* hide adverts */ -TOGGLEBUTTON_SIGNALS(checkHideAdverts, block_ads) +TOGGLEBUTTON_SIGNALS(checkHideAdverts, block_advertisements) /* enable javascript */ TOGGLEBUTTON_SIGNALS(checkEnableJavascript, enable_javascript) @@ -292,8 +292,8 @@ static void check_options(char **respath) * The GTK front end now correctly uses it as a proportion of window * width. Here we assume that a value of less than 15% is wrong * and set to the default two thirds. */ - if (nsoption_int(toolbar_status_width) < 1500) { - nsoption_set_int(toolbar_status_width, 6667); + if (nsoption_int(toolbar_status_size) < 1500) { + nsoption_set_int(toolbar_status_size, 6667); } /* user options should be stored in the users home directory */ diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 01f7fe5c2..cf5bbed85 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -1286,7 +1286,7 @@ MULTIHANDLER(savewindowsize) int x,y,w,h; if (GTK_IS_PANED(g->status_pane)) { - nsoption_set_int(toolbar_status_width, + nsoption_set_int(toolbar_status_size, gtk_paned_get_position(g->status_pane)); } gtk_window_get_position(g->window, &x, &y); diff --git a/gtk/window.c b/gtk/window.c index 44b88d241..5edace8f3 100644 --- a/gtk/window.c +++ b/gtk/window.c @@ -593,12 +593,12 @@ static gboolean nsgtk_window_size_allocate_event(GtkWidget *widget, if (g->paned != NULL) { /* Set status bar / scroll bar proportion according to - * option_toolbar_status_width */ + * option_toolbar_status_size */ /* TODO: Probably want to detect when the user adjusts the * status bar width, remember that proportion for the * window, and use that here. */ gtk_paned_set_position(g->paned, - (nsoption_int(toolbar_status_width) * + (nsoption_int(toolbar_status_size) * allocation->width) / 10000); } |