From 3653856f03c6a5fefc3b6ea67bd789650b5bfa1e Mon Sep 17 00:00:00 2001 From: xbezdick <255993@mail.muni.cz> Date: Tue, 3 May 2011 14:39:17 +0200 Subject: [PATCH] Small cleanup --- shell/ev-dualscreen.c | 3 +-- shell/ev-presentation-timer.c | 2 +- shell/ev-window.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c index 0fa97821..a00338f2 100644 --- a/shell/ev-dualscreen.c +++ b/shell/ev-dualscreen.c @@ -107,7 +107,6 @@ ev_dscwindow_sidebar_visibility_cb (GtkWidget *sidebar) static void ev_dscwindow_set_page (EvDSCWindow *ev_dscwindow, gint page) { - guint n_pages = ev_document_get_n_pages(ev_dscwindow->priv->presentation_document); 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) { @@ -379,7 +378,7 @@ ev_dscwindow_dispose (GObject *obj) g_object_unref (priv->timer); priv->timer = NULL; }*/ - ev_presentation_timer_stop(priv->timer); + ev_presentation_timer_stop(EV_PRESENTATION_TIMER (priv->timer)); ev_window_stop_presentation (EV_WINDOW(priv->presentation_window), TRUE); G_OBJECT_CLASS (ev_dscwindow_parent_class)->dispose (obj); } diff --git a/shell/ev-presentation-timer.c b/shell/ev-presentation-timer.c index 3b2a000d..5c8d2130 100644 --- a/shell/ev-presentation-timer.c +++ b/shell/ev-presentation-timer.c @@ -37,7 +37,7 @@ struct _EvPresentationTimerPrivate gint remaining; guint page; guint pages; - guint running; + gboolean running; }; #define EV_PRESENTATION_TIMER_GET_PRIVATE(object) \ diff --git a/shell/ev-window.c b/shell/ev-window.c index 799f64d6..ef6f0b16 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -4053,13 +4053,13 @@ ev_window_run_presentation (EvWindow *window) if (window->priv->metadata && !ev_window_is_empty (window)) ev_metadata_set_boolean (window->priv->metadata, "presentation", TRUE); -// if ( get_num_monitors(GTK_WINDOW(window)) > 1) { + if ( get_num_monitors(GTK_WINDOW(window)) > 1) { EvDSCWindow *control = ev_dscwindow_get_control(); gtk_window_present (GTK_WINDOW (control)); ev_dscwindow_set_presentation (control, window, window->priv->document, EV_VIEW_PRESENTATION(window->priv->presentation_view)); -// } + } } void -- 2.39.3