diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2011-03-12 10:30:33 -0700 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2011-03-12 10:33:54 -0700 |
| commit | a6e1e09f9e6bf2ff0497b643eb3623065cbc841d (patch) | |
| tree | 8668d325cb27f5805a02cd4231c361e0d29f4e3d /src | |
| parent | 1a59b06c409d27f44e035b017f01a4325690e36a (diff) | |
remove some duplicated code in scroll_cmd
Diffstat (limited to 'src')
| -rw-r--r-- | src/uzbl-core.c | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/uzbl-core.c b/src/uzbl-core.c index 4e1a7d8..5151171 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -464,30 +464,25 @@ scroll_cmd(WebKitWebView* page, GArray *argv, GString *result) { (void) page; (void) result; gchar *direction = g_array_index(argv, gchar*, 0); gchar *argv1 = g_array_index(argv, gchar*, 1); + GtkAdjustment *bar = NULL; if (g_strcmp0(direction, "horizontal") == 0) - { - if (g_strcmp0(argv1, "begin") == 0) - gtk_adjustment_set_value(uzbl.gui.bar_h, gtk_adjustment_get_lower(uzbl.gui.bar_h)); - else if (g_strcmp0(argv1, "end") == 0) - gtk_adjustment_set_value (uzbl.gui.bar_h, gtk_adjustment_get_upper(uzbl.gui.bar_h) - - gtk_adjustment_get_page_size(uzbl.gui.bar_h)); - else - scroll(uzbl.gui.bar_h, argv1); - } + bar = uzbl.gui.bar_h; else if (g_strcmp0(direction, "vertical") == 0) - { - if (g_strcmp0(argv1, "begin") == 0) - gtk_adjustment_set_value(uzbl.gui.bar_v, gtk_adjustment_get_lower(uzbl.gui.bar_v)); - else if (g_strcmp0(argv1, "end") == 0) - gtk_adjustment_set_value (uzbl.gui.bar_v, gtk_adjustment_get_upper(uzbl.gui.bar_v) - - gtk_adjustment_get_page_size(uzbl.gui.bar_v)); - else - scroll(uzbl.gui.bar_v, argv1); + bar = uzbl.gui.bar_v; + else { + if(uzbl.state.verbose) + puts("Unrecognized scroll format"); + return; } + + if (g_strcmp0(argv1, "begin") == 0) + gtk_adjustment_set_value(bar, gtk_adjustment_get_lower(bar)); + else if (g_strcmp0(argv1, "end") == 0) + gtk_adjustment_set_value (bar, gtk_adjustment_get_upper(bar) - + gtk_adjustment_get_page_size(bar)); else - if(uzbl.state.verbose) - puts("Unrecognized scroll format"); + scroll(bar, argv1); } |