Index: gtk/gtkscrolledwindow.c
===================================================================
--- gtk/gtkscrolledwindow.c	(revision 21330)
+++ gtk/gtkscrolledwindow.c	(arbetskopia)
@@ -445,8 +445,8 @@ gtk_scrolled_window_set_hadjustment (Gtk
   
   if (bin->child)
     gtk_widget_set_scroll_adjustments (bin->child,
-				       gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)),
-				       gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar)));
+                                       gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)),
+                                       gtk_scrolled_window_get_vadjustment (scrolled_window));
 
   g_object_notify (G_OBJECT (scrolled_window), "hadjustment");
 }
@@ -499,8 +499,8 @@ gtk_scrolled_window_set_vadjustment (Gtk
 
   if (bin->child)
     gtk_widget_set_scroll_adjustments (bin->child,
-				       gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)),
-				       gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar)));
+                                       gtk_scrolled_window_get_hadjustment (scrolled_window),
+                                       gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar)));
 
   g_object_notify (G_OBJECT (scrolled_window), "vadjustment");
 }
@@ -1614,8 +1614,8 @@ gtk_scrolled_window_add (GtkContainer *c
 
   /* this is a temporary message */
   if (!gtk_widget_set_scroll_adjustments (child,
-					  gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)),
-					  gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar))))
+                                          gtk_scrolled_window_get_hadjustment (scrolled_window),
+                                          gtk_scrolled_window_get_vadjustment (scrolled_window)))
     g_warning ("gtk_scrolled_window_add(): cannot add non scrollable widget "
 	       "use gtk_scrolled_window_add_with_viewport() instead");
 }
