From ee73e27fd7040290227f53cf989fd2d7d993c69f Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Mon, 27 Jul 2015 09:33:32 -0400 Subject: [PATCH] quartz: Fix building Broken by 6d04183c5d6 and 6ac07a2e85ea --- gdk/quartz/GdkQuartzNSWindow.c | 6 +++--- gtk/gtkdnd-quartz.c | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gdk/quartz/GdkQuartzNSWindow.c b/gdk/quartz/GdkQuartzNSWindow.c index 848ed50daf..155dec9a6a 100644 --- a/gdk/quartz/GdkQuartzNSWindow.c +++ b/gdk/quartz/GdkQuartzNSWindow.c @@ -665,14 +665,14 @@ update_context_from_dragging_info (id sender) event->dnd.send_event = FALSE; event->dnd.context = g_object_ref (_gdk_quartz_drag_source_context); - screen = gdk_window_get_screen (event.dnd.window); + screen = gdk_window_get_screen (event->dnd.window); if (screen) { GList* windows, *list; gint gx, gy; - event.dnd.context->dest_window = NULL; + event->dnd.context->dest_window = NULL; windows = gdk_screen_get_toplevel_windows (screen); _gdk_quartz_window_nspoint_to_gdk_xy (aPoint, &gx, &gy); @@ -688,7 +688,7 @@ update_context_from_dragging_info (id sender) wh = gdk_window_get_height (win); if (gx > wx && gy > wy && gx <= wx + ww && gy <= wy + wh) - event.dnd.context->dest_window = win; + event->dnd.context->dest_window = win; } } diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c index 68a47c409a..30c0d06ade 100644 --- a/gtk/gtkdnd-quartz.c +++ b/gtk/gtkdnd-quartz.c @@ -62,7 +62,8 @@ static void gtk_drag_source_site_destroy (gpointer data); static GtkDragSourceInfo *gtk_drag_get_source_info (GdkDragContext *context, gboolean create); -static void gtk_drag_drop_finished (GtkDragSourceInfo *info); +static void gtk_drag_drop_finished (GtkDragSourceInfo *info, + GtkDragResult result); extern GdkDragContext *gdk_quartz_drag_source_context (); /* gdk/quartz/gdkdnd-quartz.c */ @@ -1399,7 +1400,7 @@ gtk_drag_cancel (GdkDragContext *context) info = gtk_drag_get_source_info (context, FALSE); if (info != NULL) - gtk_drag_drop_finished (info); + gtk_drag_drop_finished (info, GTK_DRAG_RESULT_ERROR); } static gboolean @@ -2068,7 +2069,7 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info, if (!success) g_signal_emit_by_name (info->source_widget, "drag-failed", - info->context, GTK_DRAG_RESULT_NO_TARGET, &success); + info->context, result, &success); if (success && info->delete) g_signal_emit_by_name (info->source_widget, "drag-data-delete",