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