diff options
author | Matthias Clasen <mclasen@redhat.com> | 2005-07-08 14:36:31 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-07-08 14:36:31 +0000 |
commit | b53a336e11a29f897d9ab27f1748785cd93e7f8c (patch) | |
tree | 60d7b85c74809126af76d03765ddf2526e637bfa | |
parent | cacfdbc2aea3a63c59403152e2d5e222bee14c3d (diff) | |
download | gtk+-b53a336e11a29f897d9ab27f1748785cd93e7f8c.tar.gz |
Pass a GdkDragAction to gtk_drag_get_cursor. (#309784, Sebastian Bacher)
2005-07-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to
gtk_drag_get_cursor. (#309784, Sebastian Bacher)
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
-rw-r--r-- | gtk/gtkdnd.c | 2 |
4 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2005-07-08 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to + gtk_drag_get_cursor. (#309784, Sebastian Bacher) + 2005-07-08 Tor Lillqvist <tml@novell.com> * gtk/gtkfilesel.c: Use g_get_host_name(). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e1ae1b07c7..e34ac3f657 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-07-08 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to + gtk_drag_get_cursor. (#309784, Sebastian Bacher) + 2005-07-08 Tor Lillqvist <tml@novell.com> * gtk/gtkfilesel.c: Use g_get_host_name(). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e1ae1b07c7..e34ac3f657 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-07-08 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to + gtk_drag_get_cursor. (#309784, Sebastian Bacher) + 2005-07-08 Tor Lillqvist <tml@novell.com> * gtk/gtkfilesel.c: Use g_get_host_name(). diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index a8eb78c4ac..4bd2739390 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) { |