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=/trunk/; revision=2515

diff --git a/ChangeLog b/ChangeLog
index 4e9509d47e473f420104d8e319165c08f718ef49..915d1251e5c097279a1bb64010074e22b7d08bbe 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-19  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * NEWS:

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 997d54198de85a65e490237f8e0992877e35a311..08694725b5c40b69cc3ac028d17912151ced5576 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -4904,6 +4904,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);
        
@@ -4945,6 +4952,13 @@ ev_view_previous_page (EvView *view)
                ev_view_reset_presentation_state (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);