X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=evince.git;a=blobdiff_plain;f=shell%2Fev-dualscreen.c;h=bb3c89e7d9f2aca01f06faa1a1e43b341d1b0eef;hp=cdeb4aeaeef7af3d57978b7340a1f7f5430a2796;hb=efec6a4b614de84b8639977f278159aa28c38994;hpb=f3731bd3bdbcdc18c53e0f74bdaac93311046352 diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c index cdeb4aea..bb3c89e7 100644 --- a/shell/ev-dualscreen.c +++ b/shell/ev-dualscreen.c @@ -44,7 +44,7 @@ struct _EvDSCWindowPrivate { GtkWidget *notesview_scrolled_window; GtkWidget *presentation_window; - EvView *presentation_view; + EvViewPresentation *presentation_view; EvDocument * presentation_document; gint moveback_monitor; }; @@ -216,14 +216,14 @@ ev_dscwindow_presentation_page_changed_cb (EvDocumentModel *model, **/ void ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow, - EvWindow *presentation_window, EvDocument *document, GtkWidget *pview) + EvWindow *presentation_window, EvDocument *document, EvViewPresentation *pview) { if (!EV_IS_WINDOW (presentation_window)) return; - ev_dscwindow->priv->presentation_window = presentation_window; + ev_dscwindow->priv->presentation_window = GTK_WIDGET(presentation_window); ev_dscwindow->priv->presentation_document = document; - ev_dscwindow->priv->presentation_view = pview; + ev_dscwindow->priv->presentation_view = EV_VIEW_PRESENTATION(pview); g_signal_connect (ev_dscwindow->priv->presentation_view, "notify::page", G_CALLBACK (ev_dscwindow_presentation_page_changed_cb), @@ -362,14 +362,14 @@ ev_dscwindow_dispose (GObject *obj) // ev_document_model_set_document (priv->model, NULL); // ev_view_set_document (EV_VIEW (priv->overview), NULL); - g_object_unref (priv->overview); +// g_object_unref (priv->overview); // } // if (EV_IS_VIEW (priv->notesview)) { // ev_view_set_document (EV_VIEW (priv->notesview), NULL); // g_object_unref (priv->notesview); // } /*TODO: save fulscreen state*/ - ev_window_stop_presentation (priv->presentation_window, 0); + ev_window_stop_presentation (EV_WINDOW(priv->presentation_window), 0); if (priv->moveback_monitor >= 0) { GtkWindow * presentation_window = GTK_WINDOW (priv->presentation_window);