Index: gtk/gtkscrolledwindow.c
===================================================================
--- gtk/gtkscrolledwindow.c	(revision 19949)
+++ gtk/gtkscrolledwindow.c	(arbetskopia)
@@ -367,6 +367,8 @@
 {
   GTK_WIDGET_SET_FLAGS (scrolled_window, GTK_NO_WINDOW | GTK_CAN_FOCUS);
 
+  /* Instantiated by gtk_scrolled_window_set_[hv]adjustment called
+     from set_property */
   scrolled_window->hscrollbar = NULL;
   scrolled_window->vscrollbar = NULL;
   scrolled_window->hscrollbar_policy = GTK_POLICY_ALWAYS;
@@ -511,9 +513,7 @@
 {
   g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), NULL);
 
-  return (scrolled_window->hscrollbar ?
-	  gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)) :
-	  NULL);
+  return gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar));
 }
 
 GtkAdjustment*
@@ -521,9 +521,7 @@
 {
   g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), NULL);
 
-  return (scrolled_window->vscrollbar ?
-	  gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar)) :
-	  NULL);
+  return gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
 }
 
 /**
@@ -532,8 +530,7 @@
  * 
  * Returns the horizontal scrollbar of @scrolled_window.
  *
- * Returns: the horizontal scrollbar of the scrolled window, or 
- *  %NULL if it does not have one.
+ * Returns: the horizontal scrollbar of the scrolled window
  *
  * Since: 2.8
  */
@@ -551,8 +548,7 @@
  * 
  * Returns the vertical scrollbar of @scrolled_window.
  *
- * Returns: the vertical scrollbar of the scrolled window, or
- *  %NULL if it does not have one.
+ * Returns: the vertical scrollbar of the scrolled window
  *
  * Since: 2.8
  */
@@ -813,7 +809,7 @@
 				  GParamSpec   *pspec)
 {
   GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (object);
-  
+
   switch (prop_id)
     {
     case PROP_HADJUSTMENT:
@@ -1024,10 +1020,8 @@
 
       scrolled_window = GTK_SCROLLED_WINDOW (container);
       
-      if (scrolled_window->vscrollbar)
-	callback (scrolled_window->vscrollbar, callback_data);
-      if (scrolled_window->hscrollbar)
-	callback (scrolled_window->hscrollbar, callback_data);
+      callback (scrolled_window->vscrollbar, callback_data);
+      callback (scrolled_window->hscrollbar, callback_data);
     }
 }
 
@@ -1037,7 +1031,7 @@
 				  gboolean           horizontal)
 {
   GtkAdjustment *adjustment = NULL;
-  
+
   switch (scroll)
     {
     case GTK_SCROLL_STEP_UP:
@@ -1084,19 +1078,17 @@
       return FALSE;
     }
 
-  if ((horizontal && (!scrolled_window->hscrollbar || !scrolled_window->hscrollbar_visible)) ||
-      (!horizontal && (!scrolled_window->vscrollbar || !scrolled_window->vscrollbar_visible)))
+  if ((horizontal && !scrolled_window->hscrollbar_visible) ||
+      (!horizontal && !scrolled_window->vscrollbar_visible))
     return FALSE;
 
   if (horizontal)
     {
-      if (scrolled_window->hscrollbar)
-	adjustment = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar));
+      adjustment = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar));
     }
   else
     {
-      if (scrolled_window->vscrollbar)
-	adjustment = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
+      adjustment = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
     }
 
   if (adjustment)
@@ -1572,8 +1564,7 @@
 
   scrolled_win = GTK_SCROLLED_WINDOW (data);
 
-  if (scrolled_win->hscrollbar &&
-      adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->hscrollbar)))
+  if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->hscrollbar)))
     {
       if (scrolled_win->hscrollbar_policy == GTK_POLICY_AUTOMATIC)
 	{
@@ -1586,8 +1577,7 @@
 	    gtk_widget_queue_resize (GTK_WIDGET (scrolled_win));
 	}
     }
-  else if (scrolled_win->vscrollbar &&
-	   adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->vscrollbar)))
+  else if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->vscrollbar)))
     {
       if (scrolled_win->vscrollbar_policy == GTK_POLICY_AUTOMATIC)
 	{
