diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2011-03-12 12:27:55 -0700 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2011-03-12 12:37:42 -0700 |
| commit | b7b8b4bd29d00c94e077b8ec70f795182f89e3ba (patch) | |
| tree | 9590cc19381cf28ae09e61ea555328efd83b3b70 /src | |
| parent | a6e1e09f9e6bf2ff0497b643eb3623065cbc841d (diff) | |
set_webview_scroll_adjustments is pointless now
Diffstat (limited to 'src')
| -rw-r--r-- | src/uzbl-core.c | 32 | ||||
| -rw-r--r-- | src/uzbl-core.h | 1 |
2 files changed, 9 insertions, 24 deletions
diff --git a/src/uzbl-core.c b/src/uzbl-core.c index 5151171..c140140 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -1644,28 +1644,6 @@ retrieve_geometry() { uzbl.gui.geometry = g_string_free(buf, FALSE); } -void -set_webview_scroll_adjustments() { -#if GTK_CHECK_VERSION(2,91,0) - gtk_scrollable_set_hadjustment (GTK_SCROLLABLE(uzbl.gui.web_view), uzbl.gui.bar_h); - gtk_scrollable_set_vadjustment (GTK_SCROLLABLE(uzbl.gui.web_view), uzbl.gui.bar_v); -#else - gtk_widget_set_scroll_adjustments (GTK_WIDGET (uzbl.gui.web_view), - uzbl.gui.bar_h, uzbl.gui.bar_v); -#endif - - g_object_connect(G_OBJECT (uzbl.gui.bar_v), - "signal::value-changed", (GCallback)scroll_vert_cb, NULL, - "signal::changed", (GCallback)scroll_vert_cb, NULL, - NULL); - - g_object_connect(G_OBJECT (uzbl.gui.bar_h), - "signal::value-changed", (GCallback)scroll_horiz_cb, NULL, - "signal::changed", (GCallback)scroll_horiz_cb, NULL, - NULL); -} - - /* Set up gtk, gobject, variable defaults and other things that tests and other * external applications need to do anyhow */ void @@ -1814,7 +1792,15 @@ main (int argc, char* argv[]) { uzbl.gui.bar_h = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (uzbl.gui.scrolled_win)); uzbl.gui.bar_v = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (uzbl.gui.scrolled_win)); - set_webview_scroll_adjustments(); + g_object_connect(G_OBJECT (uzbl.gui.bar_v), + "signal::value-changed", (GCallback)scroll_vert_cb, NULL, + "signal::changed", (GCallback)scroll_vert_cb, NULL, + NULL); + + g_object_connect(G_OBJECT (uzbl.gui.bar_h), + "signal::value-changed", (GCallback)scroll_horiz_cb, NULL, + "signal::changed", (GCallback)scroll_horiz_cb, NULL, + NULL); gchar *xwin = g_strdup_printf("%d", (int)uzbl.xwin); g_setenv("UZBL_XID", xwin, TRUE); diff --git a/src/uzbl-core.h b/src/uzbl-core.h index 897f68e..d8f8375 100644 --- a/src/uzbl-core.h +++ b/src/uzbl-core.h @@ -314,7 +314,6 @@ void dump_config(); void dump_config_as_events(); void retrieve_geometry(); -void set_webview_scroll_adjustments(); void event(WebKitWebView *page, GArray *argv, GString *result); void init_connect_socket(); gboolean remove_socket_from_array(GIOChannel *chan); |