[nautilus] Make 'next row' behaviour work again by making it general According to feedback on a11y list this sh

[Nelson BenÃtez LeÃn <nbenitez src gnome org>]

commit 40be4b85f51fc7b192ef7421b2ede27954997cc8
Author: Nelson Benitez Leon <nbenitezl gmail com>
Date:   Fri Dec 2 16:11:55 2011 +0100

    Make 'next row' behaviour work again by making it general According to feedback on a11y list this should not hurt a11y. Fixes bug 660881

 libnautilus-private/nautilus-icon-container.c |   47 +++++++++++-------------
 1 files changed, 22 insertions(+), 25 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index f0513c3..8e443e6 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -3601,7 +3601,7 @@ keyboard_arrow_key (NautilusIconContainer *container,
 		    IsBetterIconFunction better_start,
 		    IsBetterIconFunction empty_start,
 		    IsBetterIconFunction better_destination,
-		    IsBetterIconFunction better_destination_fallback_if_no_a11y,
+		    IsBetterIconFunction better_destination_fallback,
 		    IsBetterIconFunction better_destination_fallback_fallback,
 		    IsBetterIconFunction better_destination_manual)
 {
@@ -3648,15 +3648,12 @@ keyboard_arrow_key (NautilusIconContainer *container,
 			 container->details->auto_layout ? better_destination : better_destination_manual,
 			 &data);
 
-		/* only wrap around to next/previous row/column if no a11y is used.
-		 * Visually impaired people may be easily confused by this.
-		 */
+		/* Wrap around to next/previous row/column */
 		if (to == NULL &&
-		    better_destination_fallback_if_no_a11y != NULL &&
-		    ATK_IS_NO_OP_OBJECT (gtk_widget_get_accessible (GTK_WIDGET (container)))) {
+		    better_destination_fallback != NULL) {
 			to = find_best_icon
 				(container, from,
-				 better_destination_fallback_if_no_a11y,
+				 better_destination_fallback,
 				 &data);
 		}
 
@@ -3706,14 +3703,14 @@ static void
 keyboard_right (NautilusIconContainer *container,
 		GdkEventKey *event)
 {
-	IsBetterIconFunction no_a11y;
+	IsBetterIconFunction fallback;
 	IsBetterIconFunction next_column_fallback;
 
-	no_a11y = NULL;
+	fallback = NULL;
 	if (container->details->auto_layout &&
 	    !nautilus_icon_container_is_layout_vertical (container) &&
 	    !is_rectangle_selection_event (event)) {
-		no_a11y = next_row_leftmost;
+		fallback = next_row_leftmost;
 	}
 
 	next_column_fallback = NULL;
@@ -3732,7 +3729,7 @@ keyboard_right (NautilusIconContainer *container,
 			    nautilus_icon_container_is_layout_rtl (container) ?
 			    rightmost_in_top_row : leftmost_in_top_row,
 			    same_row_right_side_leftmost,
-			    no_a11y,
+			    fallback,
 			    next_column_fallback,
 			    closest_in_90_degrees);
 }
@@ -3741,14 +3738,14 @@ static void
 keyboard_left (NautilusIconContainer *container,
 	       GdkEventKey *event)
 {
-	IsBetterIconFunction no_a11y;
+	IsBetterIconFunction fallback;
 	IsBetterIconFunction previous_column_fallback;
 
-	no_a11y = NULL;
+	fallback = NULL;
 	if (container->details->auto_layout &&
 	    !nautilus_icon_container_is_layout_vertical (container) &&
 	    !is_rectangle_selection_event (event)) {
-		no_a11y = previous_row_rightmost;
+		fallback = previous_row_rightmost;
 	}
 
 	previous_column_fallback = NULL;
@@ -3767,7 +3764,7 @@ keyboard_left (NautilusIconContainer *container,
 			    nautilus_icon_container_is_layout_rtl (container) ?
 			    rightmost_in_top_row : leftmost_in_top_row,
 			    same_row_left_side_rightmost,
-			    no_a11y,
+			    fallback,
 			    previous_column_fallback,
 			    closest_in_90_degrees);
 }
@@ -3776,17 +3773,17 @@ static void
 keyboard_down (NautilusIconContainer *container,
 	       GdkEventKey *event)
 {
-	IsBetterIconFunction no_a11y;
+	IsBetterIconFunction fallback;
 	IsBetterIconFunction next_row_fallback;
 
-	no_a11y = NULL;
+	fallback = NULL;
 	if (container->details->auto_layout &&
 	    nautilus_icon_container_is_layout_vertical (container) &&
 	    !is_rectangle_selection_event (event)) {
 		if (gtk_widget_get_direction (GTK_WIDGET (container)) == GTK_TEXT_DIR_RTL) {
-			no_a11y = previous_column_highest;
+			fallback = previous_column_highest;
 		} else {
-			no_a11y = next_column_highest;
+			fallback = next_column_highest;
 		}
 	}
 
@@ -3809,7 +3806,7 @@ keyboard_down (NautilusIconContainer *container,
 			    nautilus_icon_container_is_layout_rtl (container) ?
 			    rightmost_in_top_row : leftmost_in_top_row,
 			    same_column_below_highest,
-			    no_a11y,
+			    fallback,
 			    next_row_fallback,
 			    closest_in_90_degrees);
 }
@@ -3818,16 +3815,16 @@ static void
 keyboard_up (NautilusIconContainer *container,
 	     GdkEventKey *event)
 {
-	IsBetterIconFunction no_a11y;
+	IsBetterIconFunction fallback;
 
-	no_a11y = NULL;
+	fallback = NULL;
 	if (container->details->auto_layout &&
 	    nautilus_icon_container_is_layout_vertical (container) &&
 	    !is_rectangle_selection_event (event)) {
 		if (gtk_widget_get_direction (GTK_WIDGET (container)) == GTK_TEXT_DIR_RTL) {
-			no_a11y = next_column_bottommost;
+			fallback = next_column_bottommost;
 		} else {
-			no_a11y = previous_column_lowest;
+			fallback = previous_column_lowest;
 		}
 	}
 
@@ -3841,7 +3838,7 @@ keyboard_up (NautilusIconContainer *container,
 			    nautilus_icon_container_is_layout_rtl (container) ?
 			    rightmost_in_top_row : leftmost_in_top_row,
 			    same_column_above_lowest,
-			    no_a11y,
+			    fallback,
 			    NULL,
 			    closest_in_90_degrees);
 }