-/*
-+ if (!EV_IS_DSCWINDOW (self))
-+ return FALSE;
-+
-+ EvDSCWindowPrivate *priv = EV_DSCWINDOW_GET_PRIVATE (self);
-+
-+ gint num_monitors = get_num_monitors (GTK_WINDOW (self));
-+
-+ if (num_monitors == 2) {
-+ GtkWindow * presentation_window = GTK_WINDOW (priv->presentation_window);
-+ GdkScreen * screen = gtk_window_get_screen (presentation_window);
-+
-+ gint monitor_1 = gdk_screen_get_monitor_at_window (screen,
-+ GTK_WIDGET (presentation_window)->window);
-+
-+ gint monitor_2 = (monitor_1 + 1) % 2;
-+
-+ GdkRectangle coords;
-+ gdk_screen_get_monitor_geometry (screen, monitor_2, &coords);
-+ ev_window_stop_presentation (priv->presentation_window);
-+ gtk_window_move (presentation_window, coords.x, coords.y);
-+ ev_window_run_presentation (priv->presentation_window);
-+ priv->moveback_monitor = monitor_1;
-+
-+ gdk_screen_get_monitor_geometry (screen, monitor_1, &coords);
-+ gtk_window_unmaximize (GTK_WINDOW (self));
-+ gtk_window_move (GTK_WINDOW (self), coords.x, coords.y);
-+ gtk_window_maximize (GTK_WINDOW (self));
-+ }*/
+
+ if (!EV_IS_DSCWINDOW (ev_dscwindow))
+ return FALSE;
+
+ gint num_monitors = get_num_monitors (GTK_WINDOW (ev_dscwindow));
+
+ if (num_monitors == 2) {
+ GtkWindow *presentation_window = GTK_WINDOW (ev_dscwindow->priv->presentation_window);
+ GdkScreen *screen = gtk_window_get_screen (presentation_window);
+
+ gint monitor_1 = gdk_screen_get_monitor_at_window (screen,
+ gtk_widget_get_window (GTK_WIDGET (presentation_window)));
+
+ gint monitor_2 = (monitor_1 + 1) % 2;
+
+ GdkRectangle coords;
+ gdk_screen_get_monitor_geometry (screen, monitor_2, &coords);
+ gtk_window_move (presentation_window, coords.x, coords.y);
+ ev_dscwindow->priv->moveback_monitor = monitor_1;
+
+ gdk_screen_get_monitor_geometry (screen, monitor_1, &coords);
+ gtk_window_unmaximize (GTK_WINDOW (ev_dscwindow));
+ gtk_window_move (GTK_WINDOW (ev_dscwindow), coords.x, coords.y);
+ gtk_window_maximize (GTK_WINDOW (ev_dscwindow));
+ }