From b53a336e11a29f897d9ab27f1748785cd93e7f8c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Jul 2005 14:36:31 +0000 Subject: [PATCH] Pass a GdkDragAction to gtk_drag_get_cursor. (#309784, Sebastian Bacher) 2005-07-08 Matthias Clasen * gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to gtk_drag_get_cursor. (#309784, Sebastian Bacher) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkdnd.c | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e1ae1b07c..e34ac3f65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-07-08 Matthias Clasen + + * gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to + gtk_drag_get_cursor. (#309784, Sebastian Bacher) + 2005-07-08 Tor Lillqvist * gtk/gtkfilesel.c: Use g_get_host_name(). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e1ae1b07c..e34ac3f65 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-07-08 Matthias Clasen + + * gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to + gtk_drag_get_cursor. (#309784, Sebastian Bacher) + 2005-07-08 Tor Lillqvist * gtk/gtkfilesel.c: Use g_get_host_name(). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e1ae1b07c..e34ac3f65 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-07-08 Matthias Clasen + + * gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to + gtk_drag_get_cursor. (#309784, Sebastian Bacher) + 2005-07-08 Tor Lillqvist * gtk/gtkfilesel.c: Use g_get_host_name(). diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index a8eb78c4a..4bd273939 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -749,7 +749,7 @@ gtk_drag_update_cursor (GtkDragSourceInfo *info) return; cursor = gtk_drag_get_cursor (gdk_cursor_get_display (info->cursor), - i, info); + drag_cursors[i].action, info); if (cursor != info->cursor) {