From: Cesar Fernandez <cesar@pk2.org>
Date: Thu, 21 Jun 2007 14:20:20 +0000 (+0000)
Subject: Do not change current page when returning from black/white mode in
X-Git-Tag: EVINCE_0_9_2~30
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=f63ab8c1da7a2bea3ac3c402d83ecd3091821180;p=evince.git

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 4e9509d4..915d1251 100644
--- 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 997d5419..08694725 100644
--- 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);