X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-window.c;h=4d2283b043b2b7ad2249018b8ec64c53b204b8fc;hb=53eea4249bc0255faa1bf51cb4fb455db4cc69f1;hp=3c41017d46c141b4d1d1f2981acc8fa468516b40;hpb=62844084382c2c4fcf8baf960ce84d99b7b9093d;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 3c41017d..4d2283b0 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1466,8 +1466,15 @@ ev_window_set_document (EvWindow *ev_window, EvDocument *document)
 	}
 
 	if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
+		gint current_page;
+
+		current_page = ev_view_presentation_get_current_page (
+			EV_VIEW_PRESENTATION (ev_window->priv->presentation_view));
 		gtk_widget_destroy (ev_window->priv->presentation_view);
 		ev_window->priv->presentation_view = NULL;
+
+		/* Update the model with the current presentation page */
+		ev_document_model_set_page (ev_window->priv->model, current_page);
 		ev_window_run_presentation (ev_window);
 	}
 
@@ -6702,9 +6709,15 @@ ev_window_media_player_key_pressed (EvWindow    *window,
 	if (strcmp (key, "Play") == 0) {
 		ev_window_run_presentation (window);
 	} else if (strcmp (key, "Previous") == 0) {
-		ev_window_cmd_go_previous_page (NULL, window);
+		if (EV_WINDOW_IS_PRESENTATION (window))
+			ev_view_presentation_previous_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
+		else
+			ev_window_cmd_go_previous_page (NULL, window);
 	} else if (strcmp (key, "Next") == 0) {
-		ev_window_cmd_go_next_page (NULL, window);
+		if (EV_WINDOW_IS_PRESENTATION (window))
+			ev_view_presentation_next_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
+		else
+			ev_window_cmd_go_next_page (NULL, window);
 	} else if (strcmp (key, "FastForward") == 0) {
 		ev_window_cmd_go_last_page (NULL, window);
 	} else if (strcmp (key, "Rewind") == 0) {