[evince] [libview] Fix build with GSEAL enabled



commit ccf1a3cbc3fc2caa4a82713c1cff7a875de292f3
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Mon May 31 19:32:21 2010 +0200

    [libview] Fix build with GSEAL enabled

 libview/ev-view-presentation.c |   27 +++++++++++++--------------
 libview/ev-view.c              |    2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index c0234a8..311695e 100644
--- a/libview/ev-view-presentation.c
+++ b/libview/ev-view-presentation.c
@@ -627,29 +627,28 @@ ev_view_presentation_goto_entry_activate (GtkEntry           *entry,
 static void
 ev_view_presentation_goto_window_create (EvViewPresentation *pview)
 {
-	GtkWidget *frame, *hbox, *toplevel, *label;
+	GtkWidget *frame, *hbox, *label;
+	GtkWindow *toplevel, *goto_window;
 
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (pview));
+	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (pview)));
+	goto_window = GTK_WINDOW (pview->goto_window);
 
 	if (pview->goto_window) {
-		if (GTK_WINDOW (toplevel)->group)
-			gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
-						     GTK_WINDOW (pview->goto_window));
-		else if (GTK_WINDOW (pview->goto_window)->group)
-			gtk_window_group_remove_window (GTK_WINDOW (pview->goto_window)->group,
-							GTK_WINDOW (pview->goto_window));
+		if (gtk_window_has_group (toplevel))
+			gtk_window_group_add_window (gtk_window_get_group (toplevel), goto_window);
+		else if (gtk_window_has_group (goto_window))
+			gtk_window_group_remove_window (gtk_window_get_group (goto_window), goto_window);
+
 		return;
 	}
 
 	pview->goto_window = gtk_window_new (GTK_WINDOW_POPUP);
-	gtk_window_set_screen (GTK_WINDOW (pview->goto_window),
-			       gtk_widget_get_screen (GTK_WIDGET (pview)));
+	gtk_window_set_screen (goto_window, gtk_widget_get_screen (GTK_WIDGET (pview)));
 
-	if (GTK_WINDOW (toplevel)->group)
-		gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
-					     GTK_WINDOW (pview->goto_window));
+	if (gtk_window_has_group (toplevel))
+		gtk_window_group_add_window (gtk_window_get_group (toplevel), goto_window);
 
-	gtk_window_set_modal (GTK_WINDOW (pview->goto_window), TRUE);
+	gtk_window_set_modal (goto_window, TRUE);
 
 	g_signal_connect (pview->goto_window, "delete_event",
 			  G_CALLBACK (ev_view_presentation_goto_window_delete_event),
diff --git a/libview/ev-view.c b/libview/ev-view.c
index 92190f5..ac14b69 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -3471,7 +3471,7 @@ ev_view_drag_motion (GtkWidget      *widget,
 	if (gtk_drag_get_source_widget (context) == widget)
 		gdk_drag_status (context, 0, time);
 	else
-		gdk_drag_status (context, context->suggested_action, time);
+		gdk_drag_status (context, gdk_drag_context_get_suggested_action (context), time);
 	
 	return TRUE;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]