gtk/gtkdnd.c: Use accessor functions to access GtkWindow

This commit is contained in:
Javier Jardón
2010-08-17 15:08:19 +02:00
parent 014fc1f73a
commit 50aec80efb

View File

@@ -372,6 +372,7 @@ gtk_drag_get_ipc_widget (GtkWidget *widget)
{
GtkWidget *result;
GtkWidget *toplevel;
GtkWindowGroup *group;
result = gtk_drag_get_ipc_widget_for_screen (gtk_widget_get_screen (widget));
@@ -379,8 +380,9 @@ gtk_drag_get_ipc_widget (GtkWidget *widget)
if (GTK_IS_WINDOW (toplevel))
{
if (GTK_WINDOW (toplevel)->group)
gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
group = gtk_window_get_group (GTK_WINDOW (toplevel));
if (group)
gtk_window_group_add_window (group,
GTK_WINDOW (result));
}
@@ -545,6 +547,7 @@ static void
gtk_drag_release_ipc_widget (GtkWidget *widget)
{
GtkWindow *window = GTK_WINDOW (widget);
GtkWindowGroup *group;
GdkScreen *screen = gtk_widget_get_screen (widget);
GdkDragContext *context = g_object_get_data (G_OBJECT (widget), "drag-context");
GSList *drag_widgets = g_object_get_data (G_OBJECT (screen),
@@ -560,8 +563,9 @@ gtk_drag_release_ipc_widget (GtkWidget *widget)
ungrab_dnd_keys (widget, keyboard, GDK_CURRENT_TIME);
}
if (window->group)
gtk_window_group_remove_window (window->group, window);
group = gtk_window_get_group (window);
if (group)
gtk_window_group_remove_window (group, window);
drag_widgets = g_slist_prepend (drag_widgets, widget);
g_object_set_data (G_OBJECT (screen),
I_("gtk-dnd-ipc-widgets"),