From b2ff45ef83c94fce1d22885209a92431d7a617fb Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 13 Jun 2001 16:00:24 +0000 Subject: [PATCH] Don't pass on GDK_ACTION_DEFAULT. The Xdnd code passes zero instead, so do 2001-06-13 Alexander Larsson * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status): Don't pass on GDK_ACTION_DEFAULT. The Xdnd code passes zero instead, so do we. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/linux-fb/gdkdnd-fb.c | 5 ++++- 8 files changed, 46 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 11e94bec00..36ffab358b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-06-13 Alexander Larsson + + * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status): + Don't pass on GDK_ACTION_DEFAULT. The Xdnd code + passes zero instead, so do we. + 2001-06-13 Alexander Larsson * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 11e94bec00..36ffab358b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-06-13 Alexander Larsson + + * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status): + Don't pass on GDK_ACTION_DEFAULT. The Xdnd code + passes zero instead, so do we. + 2001-06-13 Alexander Larsson * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 11e94bec00..36ffab358b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-06-13 Alexander Larsson + + * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status): + Don't pass on GDK_ACTION_DEFAULT. The Xdnd code + passes zero instead, so do we. + 2001-06-13 Alexander Larsson * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 11e94bec00..36ffab358b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-06-13 Alexander Larsson + + * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status): + Don't pass on GDK_ACTION_DEFAULT. The Xdnd code + passes zero instead, so do we. + 2001-06-13 Alexander Larsson * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 11e94bec00..36ffab358b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-06-13 Alexander Larsson + + * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status): + Don't pass on GDK_ACTION_DEFAULT. The Xdnd code + passes zero instead, so do we. + 2001-06-13 Alexander Larsson * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 11e94bec00..36ffab358b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-06-13 Alexander Larsson + + * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status): + Don't pass on GDK_ACTION_DEFAULT. The Xdnd code + passes zero instead, so do we. + 2001-06-13 Alexander Larsson * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 11e94bec00..36ffab358b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-06-13 Alexander Larsson + + * gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status): + Don't pass on GDK_ACTION_DEFAULT. The Xdnd code + passes zero instead, so do we. + 2001-06-13 Alexander Larsson * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): diff --git a/gdk/linux-fb/gdkdnd-fb.c b/gdk/linux-fb/gdkdnd-fb.c index 659716d42c..816ae34e3f 100644 --- a/gdk/linux-fb/gdkdnd-fb.c +++ b/gdk/linux-fb/gdkdnd-fb.c @@ -646,8 +646,11 @@ gdk_drag_status (GdkDragContext *context, tmp_event.dnd.time = GDK_CURRENT_TIME; /* FIXME? */ + if (action == GDK_ACTION_DEFAULT) + action = 0; + src_context->action = action; - + gdk_event_put (&tmp_event); } }