From 1e63533e4d2fe74b17883a51f984ecacb9138231 Mon Sep 17 00:00:00 2001 From: xbezdick <255993@mail.muni.cz> Date: Thu, 5 May 2011 01:21:47 +0200 Subject: [PATCH] [dualscreen][presentation] fix Issue #9 --- libview/ev-view-presentation.c | 2 +- shell/ev-dualscreen.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c index c3e40bf5..b32a0bbb 100644 --- a/libview/ev-view-presentation.c +++ b/libview/ev-view-presentation.c @@ -517,7 +517,7 @@ ev_view_presentation_set_page (EvViewPresentation *pview, gint new_page) if (new_page >= n_pages) ev_view_presentation_set_end (pview); - else + else if (new_page != pview->current_page) ev_view_presentation_update_current_page (pview, new_page); } diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c index a3b1117d..91c4a407 100644 --- a/shell/ev-dualscreen.c +++ b/shell/ev-dualscreen.c @@ -114,16 +114,16 @@ ev_dscwindow_set_page (EvDSCWindow *ev_dscwindow, gint page) { if((ev_dscwindow->priv->page == 0) && (page == 1)) ev_presentation_timer_start (EV_PRESENTATION_TIMER (ev_dscwindow->priv->timer)); - if(ev_dscwindow->priv->page != page) { - if(ev_view_presentation_get_current_page (EV_VIEW_PRESENTATION(ev_dscwindow->priv->presentation_view)) != page); - ev_view_presentation_set_page (EV_VIEW_PRESENTATION(ev_dscwindow->priv->presentation_view), page); + if(!(ev_dscwindow->priv->page == page)) { + ev_dscwindow->priv->page = page; if(ev_document_model_get_page (ev_dscwindow->priv->model) != page) ev_document_model_set_page(ev_dscwindow->priv->model, page); if(ev_document_model_get_page (ev_dscwindow->priv->notes_model) != page) ev_document_model_set_page(ev_dscwindow->priv->notes_model, page); - ev_dscwindow->priv->page = page; + if(ev_view_presentation_get_current_page (EV_VIEW_PRESENTATION(ev_dscwindow->priv->presentation_view)) != page); + ev_view_presentation_set_page (EV_VIEW_PRESENTATION(ev_dscwindow->priv->presentation_view), page); + ev_presentation_timer_set_page (EV_PRESENTATION_TIMER(ev_dscwindow->priv->timer), page); } - ev_presentation_timer_set_page (EV_PRESENTATION_TIMER(ev_dscwindow->priv->timer), page); } static void -- 2.39.3