eog r4373 - in trunk: . src

[friemann svn gnome org]

Author: friemann
Date: Fri Feb 15 16:28:45 2008
New Revision: 4373
URL: http://svn.gnome.org/viewvc/eog?rev=4373&view=rev

Log:
2008-02-15  Felix Riemann  <friemann svn gnome org>

	* src/eog-window.c: (eog_window_key_press): Skip to the next image
	when pressing PgUp/PgDown while the collection is hidden. Avoids some
	critical warnings/crashes in that case. Fixes bug #513958.


Modified:
   trunk/ChangeLog
   trunk/src/eog-window.c

Modified: trunk/src/eog-window.c
==============================================================================
--- trunk/src/eog-window.c	(original)
+++ trunk/src/eog-window.c	Fri Feb 15 16:28:45 2008
@@ -4427,9 +4427,29 @@
 			break;
 		}
 	case GDK_Page_Up:
+		if (!eog_scroll_view_scrollbars_visible (EOG_SCROLL_VIEW (EOG_WINDOW (widget)->priv->view))) {
+			if (!GTK_WIDGET_VISIBLE (EOG_WINDOW (widget)->priv->nav)) {
+				/* If the iconview is not visible skip to the 
+				 * previous image manually as it won't handle
+				 * the keypress then. */
+				eog_window_cmd_go_prev (NULL,
+							EOG_WINDOW (widget));
+				result = TRUE;
+			} else
+				handle_selection = TRUE;
+		}
+		break;
 	case GDK_Page_Down:
 		if (!eog_scroll_view_scrollbars_visible (EOG_SCROLL_VIEW (EOG_WINDOW (widget)->priv->view))) {
-			handle_selection = TRUE;
+			if (!GTK_WIDGET_VISIBLE (EOG_WINDOW (widget)->priv->nav)) {
+				/* If the iconview is not visible skip to the 
+				 * next image manually as it won't handle
+				 * the keypress then. */
+				eog_window_cmd_go_next (NULL,
+							EOG_WINDOW (widget));
+				result = TRUE;
+			} else
+				handle_selection = TRUE;
 		}
 		break;
 	}