compile fixes

diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c
index 3a0beaea8aac23f9e5e51bb592a569f25117650e..0e8d808ba0cdffb26298f80f1ab9f7a7e6a8b34b 100644 (file)
--- a/shell/ev-dualscreen.c
+++ b/shell/ev-dualscreen.c
@@ -27,6 +27,7 @@
 #include "ev-dualscreen.h"
 #include "ev-window.h"
 #include "ev-view.h"
+#include "ev-utils.h"
 
 struct _EvDSCWindowPrivate {
        GtkWidget *main_box;
@@ -158,6 +159,7 @@ ev_dscwindow_get_control (void)
 
        return control;
 }
+
 /*TODO: Fix me!*/
 static void
 ev_dscwindow_window_placement (EvDSCWindow *ev_dscwindow)
@@ -168,7 +170,7 @@ ev_dscwindow_window_placement (EvDSCWindow *ev_dscwindow)
                GdkScreen * screen = gtk_window_get_screen (presentation_window);
 
                gint work_monitor = gdk_screen_get_monitor_at_window (screen,
-                       GTK_WIDGET (presentation_window)->window);
+                       gtk_widget_get_window (GTK_WIDGET (presentation_window)));
 
                gint presentation_monitor = (work_monitor + 1) % 2;
 
@@ -191,7 +193,7 @@ ev_dscwindow_window_placement (EvDSCWindow *ev_dscwindow)
  **/
 void
 ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow,
-       EvWindow *presentation_window)
+       EvWindow *presentation_window, EvDocument *document)
 {
        if (!EV_IS_WINDOW (presentation_window))
                return;
@@ -200,7 +202,7 @@ ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow,
        ev_dscwindow->priv->presentation_document = document;
 
        ev_document_model_set_document(ev_dscwindow->priv->model,
-               presentation_window->priv->document);
+               document);
 /*     ev_view_set_document (EV_VIEW (priv->notesview),
                priv->presentation_document);
        ev_dscwindow_window_placement (self);

diff --git a/shell/ev-dualscreen.h b/shell/ev-dualscreen.h
index 4c884324c39587079a0640851a7302c28af3723e..643a21e76f5d443dda0f8370c5f7ce0673abc55d 100644 (file)
--- a/shell/ev-dualscreen.h
+++ b/shell/ev-dualscreen.h
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 #include "ev-window.h"
 #include "ev-document.h"*/
+#include "ev-window.h"
 
 G_BEGIN_DECLS
 
@@ -50,9 +51,10 @@ struct _EvDSCWindowClass {
 
 GType          ev_dscwindow_get_type   (void);
 GtkWidget      *ev_dscwindow_new (void);
-void           ev_dscwindow_set_presentation (EvDSCWindow * self,
-                                               EvWindow *presentation_window);
-/*EvDSCWindow*    ev_dscwindow_get_control (void);*/
+void           ev_dscwindow_set_presentation (EvDSCWindow      *ev_dscwindow,
+                                               EvWindow        *presentation_window,
+                                               EvDocument      *document);
+EvDSCWindow*    ev_dscwindow_get_control (void);
 
 G_END_DECLS
 

diff --git a/shell/ev-window.c b/shell/ev-window.c
index b7cf4442457105ae55526b442cc5ba896337baca..d8ab6e18fc12ea5db9c4a5c09cf3577d8e08369d 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -51,6 +51,7 @@
 #include "ephy-zoom.h"
 
 #include "ev-application.h"
+#include "ev-dualscreen.h"
 #include "ev-document-factory.h"
 #include "ev-document-find.h"
 #include "ev-document-fonts.h"
@@ -4000,20 +4001,22 @@ ev_window_view_presentation_focus_out (EvWindow *window)
 }
 
 static void
-ev_window_run_presentation_wrapper ()
+ev_window_run_presentation_wrapper (EvWindow *window)
 {
-       if ( get_num_monitors(GTK_WINDOW(window) > 1) {
+       if ( get_num_monitors(GTK_WINDOW(window)) > 1) {
                EvWindow *presentation_window = window;
                EvDSCWindow *control = ev_dscwindow_get_control();
 
-               ev_dscwindow_set_presentation (control, presentation_window);
+               ev_dscwindow_set_presentation (control, presentation_window,
+                                               presentation_window->priv->document);
                gtk_window_present (GTK_WINDOW (control));
        } else
-               ev_window_stop_presentation (window);
+               ev_window_stop_presentation (window, TRUE);
 
 }
 static void
-ev_window_stop_presentation_wrapper(){
+ev_window_stop_presentation_wrapper(EvWindow *window, gboolean unfullscreen_window)
+{
 }
 
 void