Do not change current page when returning from black/white mode in

2007-06-21  Cesar Fernandez  <cesar@pk2.org>
	* shell/ev-view.c: (ev_view_next_page), (ev_view_previous_page):
	Do not change current page when returning from black/white mode in
	presentation. Fixes bug #415032.

svn path=/branches/gnome-2-18/; revision=2516

diff --git a/ChangeLog b/ChangeLog
index ed9cbc56c9fb5f4aa965ef33ee46d43011955342..0d2c9dada745dd4867905ea395b149fcfcd41826 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-21  Cesar Fernandez  <cesar@pk2.org>
+
+       * shell/ev-view.c: (ev_view_next_page), (ev_view_previous_page):
+
+       Do not change current page when returning from black/white mode in
+       presentation. Fixes bug #415032.
+       
 2007-06-17  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-window.c: (ev_window_clear_print_job):

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 513ba871bae2407f4dcdd3b23a61e6dc41764e8e..cd20a8c9154e43a83f06511733a35eb342f89a4a 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -4884,6 +4884,13 @@ ev_view_next_page (EvView *view)
        if (!view->page_cache)
                return FALSE;
 
+       if (view->presentation &&
+           (view->presentation_state == EV_PRESENTATION_BLACK ||
+            view->presentation_state == EV_PRESENTATION_WHITE)) {
+               ev_view_reset_presentation_state (view);
+               return FALSE;
+       }
+       
        ev_view_presentation_transition_stop (view);
        ev_view_reset_presentation_state (view);
        
@@ -4926,6 +4933,13 @@ ev_view_previous_page (EvView *view)
                return TRUE;
        }
 
+       if (view->presentation &&
+           (view->presentation_state == EV_PRESENTATION_BLACK ||
+            view->presentation_state == EV_PRESENTATION_WHITE)) {
+               ev_view_reset_presentation_state (view);
+               return FALSE;
+       }
+
        ev_view_reset_presentation_state (view);
 
        page = ev_page_cache_get_current_page (view->page_cache);