1 files changed, 30 insertions, 46 deletions

diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index e461a4c..56d2f86 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -467,30 +467,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);
 }
 
 
@@ -1445,6 +1440,7 @@ create_scrolled_win() {
 
     g->web_view     = WEBKIT_WEB_VIEW(webkit_web_view_new());
     g->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
+    WebKitWebFrame *wf = webkit_web_view_get_main_frame (g->web_view);
 
     gtk_scrolled_window_set_policy(
         GTK_SCROLLED_WINDOW(g->scrolled_win),
@@ -1480,6 +1476,10 @@ create_scrolled_win() {
       "signal::focus-in-event",                       (GCallback)focus_cb,                NULL,
       "signal::focus-out-event",                      (GCallback)focus_cb,                NULL,
       NULL);
+
+    g_object_connect (G_OBJECT (wf),
+      "signal::scrollbars-policy-changed",            (GCallback)scrollbars_policy_cb,    NULL,
+      NULL);
 }
 
 
@@ -1694,28 +1694,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((GObject*)uzbl.gui.bar_v,
-      "signal::value-changed",  (GCallback)scroll_vert_cb,  NULL,
-      "signal::changed",        (GCallback)scroll_vert_cb,  NULL,
-      NULL);
-
-    g_object_connect((GObject*)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
@@ -1861,12 +1839,18 @@ main (int argc, char* argv[]) {
     }
 
     /* Scrolling */
-    uzbl.gui.scbar_v = (GtkScrollbar*) gtk_vscrollbar_new (NULL);
-    uzbl.gui.bar_v = gtk_range_get_adjustment((GtkRange*) uzbl.gui.scbar_v);
-    uzbl.gui.scbar_h = (GtkScrollbar*) gtk_hscrollbar_new (NULL);
-    uzbl.gui.bar_h = gtk_range_get_adjustment((GtkRange*) uzbl.gui.scbar_h);
+    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);