]> www.fi.muni.cz Git - evince.git/commitdiff
[libview] Fix build with GSEAL enabled
authorCarlos Garcia Campos <carlosgc@gnome.org>
Mon, 31 May 2010 17:32:21 +0000 (19:32 +0200)
committerCarlos Garcia Campos <carlosgc@gnome.org>
Mon, 31 May 2010 17:32:21 +0000 (19:32 +0200)
libview/ev-view-presentation.c
libview/ev-view.c

index c0234a82d6565ee88318a31a928f538f89dabcfb..311695e51916ff1fe9a8e4f1a2b75c42b5c0687f 100644 (file)
@@ -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),
index 92190f56a27b2fe9aeadd9e53c183f0150e9dc44..ac14b699c7404724266e220a7515b2fd4ac20775 100644 (file)
@@ -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;
 }