X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-dualscreen.c;h=4df456cc3575527dd41c10995a1f2e8e175783ca;hb=d3f9bc975c0b9219b1f6659570e0693a2cfd84e9;hp=8fc6953a2c5a4d55b6244792fe31588fecdf42da;hpb=b834124afbc9c4f8044a9712b356533c6cd5d31a;p=evince.git

diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c
index 8fc6953a..4df456cc 100644
--- a/shell/ev-dualscreen.c
+++ b/shell/ev-dualscreen.c
@@ -192,7 +192,7 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
 
 	ev_dscwindow->priv->overview_scrolled_window = GTK_WIDGET (g_object_new (
 			GTK_TYPE_SCROLLED_WINDOW, "shadow-type", GTK_SHADOW_IN, NULL));
-	gtk_box_pack_start_defaults (GTK_BOX (v), ev_dscwindow->priv->overview_scrolled_window);
+	gtk_box_pack_start (GTK_BOX (v), ev_dscwindow->priv->overview_scrolled_window, TRUE, TRUE, 0);
 
 	ev_dscwindow->priv->model = ev_document_model_new ();
 	ev_dscwindow->priv->overview = ev_view_new ();
@@ -203,8 +203,8 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
 	ev_document_model_set_sizing_mode (ev_dscwindow->priv->model, EV_SIZING_BEST_FIT);
 
 
-	gtk_container_add (GTK_CONTAINER (priv->overview_scrolled_window),
-				   priv->overview);
+	gtk_container_add (GTK_CONTAINER (ev_dscwindow->priv->overview_scrolled_window),
+				   ev_dscwindow->priv->overview);
 
 
 	GtkWidget *e = gtk_expander_new (_("Expensive features"));
@@ -216,13 +216,13 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
 	gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (b_switch), "object-flip-horizontal");
 	gtk_toolbar_insert (GTK_TOOLBAR (t), b_switch, -1);
 	g_signal_connect (b_switch, "clicked",
-		G_CALLBACK (ev_dscwindow_switch_monitors), self);
+		G_CALLBACK (ev_dscwindow_switch_monitors), ev_dscwindow);
 
 	GtkToolItem* b_notes = gtk_tool_button_new (NULL, _("Load notes ..."));
 	gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (b_notes), "object-flip-horizontal");
 	gtk_toolbar_insert (GTK_TOOLBAR (t), b_notes, -1);
 	g_signal_connect (b_notes, "clicked",
-		G_CALLBACK (ev_dscwindow_notes_interaction), self);
+		G_CALLBACK (ev_dscwindow_notes_interaction), ev_dscwindow);
 
 	GtkToolItem* b_close = gtk_tool_button_new (NULL, _("End presentation"));
 	gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (b_close), "view-restore");
@@ -292,7 +292,8 @@ ev_dscwindow_dispose (GObject *obj)
 +		ev_view_set_document (EV_VIEW (priv->notesview), NULL);
 +		g_object_unref (priv->notesview);
 +	}*/
-	ev_window_stop_presentation (priv->presentation_window);
+/*TODO: save fulscreen state*/
+	ev_window_stop_presentation (priv->presentation_window, 0);
 
 	if (priv->moveback_monitor >= 0) {
 		GtkWindow * presentation_window = GTK_WINDOW (priv->presentation_window);
@@ -305,24 +306,24 @@ ev_dscwindow_dispose (GObject *obj)
 		gtk_window_move (presentation_window, coords.x, coords.y);
 	}
 
-	G_OBJECT_CLASS (parent_class)->dispose (obj);
+	G_OBJECT_CLASS (ev_dscwindow_parent_class)->dispose (obj);
 }
 
 
 static void
-ev_dscwindow_class_init (EvDSCWindowClass * klass)
+ev_dscwindow_class_init (EvDSCWindowClass *ev_dscwindow_class)
 {
-	GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
-	parent_class = g_type_class_peek_parent (klass);
-	g_type_class_add_private (klass, sizeof (EvDSCWindowPrivate));
+	GObjectClass *g_object_class = G_OBJECT_CLASS (ev_dscwindow_class);
+	/*parent_class = g_type_class_peek_parent (ev_dscwindow_class);*/
+	g_type_class_add_private (g_object_class, sizeof (EvDSCWindowPrivate));
 	g_object_class->dispose  = ev_dscwindow_dispose;
 }
 
 GtkWidget *
 ev_dscwindow_new (void)
 {
-	EvDSCWindow *dsc_window;
+	EvDSCWindow *ev_dscwindow;
 
-	dsc_window = g_object_new (EV_TYPE_DSCWINDOW, "type", GTK_WINDOW_TOPLEVEL, NULL);
-	return GTK_WIDGET (dsc_window);
+	ev_dscwindow = g_object_new (EV_TYPE_DSCWINDOW, "type", GTK_WINDOW_TOPLEVEL, NULL);
+	return GTK_WIDGET (ev_dscwindow);
 }